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