commit 16f0d1317925cbf9a0b674ddb61b37f3e27d64e1
author Sunny Shao <sunnyshao@google.com> Fri Dec 23 15:06:25 2022 +0800
committer Sunny Shao <sunnyshao@google.com> Fri Dec 23 15:06:25 2022 +0800
tree c68ceadbadc1fa4492d463acff413d4dae82c199
parent d308b891fa66f435fa0ebc375560959c6b68e1db

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

diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index 0d2cfe9..e6e6df3 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -43,7 +43,11 @@
     @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();