From 16f0d1317925cbf9a0b674ddb61b37f3e27d64e1 Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Fri, 23 Dec 2022 15:06:25 +0800
Subject: [PATCH] Fixed mUserId_shouldDeriveUidFromMainCaller test case fail

- getApplicationContext() return null in some test cases.
- Add null checking to avoid the NPE failed.

Fixes: 263542897
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.applications
Change-Id: I374b5bbf8911bd6d4eb992e0fa7b1a67c3d16a91
---
 src/com/android/settings/SettingsApplication.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index 0d2cfe95f72..e6e6df392f2 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -43,7 +43,11 @@ public class SettingsApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        ElapsedTimeUtils.assignSuwFinishedTimeStamp(this.getApplicationContext());
+
+        // Add null checking to avoid test case failed.
+        if (getApplicationContext() != null) {
+            ElapsedTimeUtils.assignSuwFinishedTimeStamp(getApplicationContext());
+        }
 
         // Set Spa environment.
         setSpaEnvironment();