commit 9005b3d8481bc519a20531589a8c41649d3438c4
author Sunny Shao <sunnyshao@google.com> Sat Dec 24 14:03:57 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 24 14:03:57 2022 +0000
tree 0575334cacb482c262d82f882f5248874e594584
parent ee3c5500f6af5196216000cd10c677b16d4e4ad0
parent 16f0d1317925cbf9a0b674ddb61b37f3e27d64e1

Merge "Fixed mUserId_shouldDeriveUidFromMainCaller test case fail"

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();