commit 729e8163f434d9adac038bd1820147212159f508
author Jay Aliomer <aaliomer@google.com> Fri Mar 27 16:18:21 2020 -0400
committer Jay Aliomer <aaliomer@google.com> Sat Mar 28 21:16:29 2020 -0400
tree de622a60fc9ee48196ea079785cd4482171a6887
parent 5b92e5270cd44d32b5f2cce816408faa090febd3

Dark Theme doesnt forget car changes

SetNightMode was persisting car changes through overrides reset
This was fixed

Test: manually follow steps in the bug
Fixes: 151235572
Change-Id: I6fb4bb54e7f2b4c3d5a401be3060c69e0dd1acb8

tests/app/src/android/app/cts/UiModeManagerTest.java

diff --git a/tests/app/src/android/app/cts/UiModeManagerTest.java b/tests/app/src/android/app/cts/UiModeManagerTest.java
index 77175c3..25ec9a3 100644
--- a/tests/app/src/android/app/cts/UiModeManagerTest.java
+++ b/tests/app/src/android/app/cts/UiModeManagerTest.java
@@ -26,8 +26,6 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
-import androidx.test.filters.Suppress;
-
 import com.android.compatibility.common.util.BatteryUtils;
 import com.android.compatibility.common.util.SettingsUtils;
 
@@ -50,6 +48,9 @@
         super.setUp();
         mUiModeManager = (UiModeManager) getContext().getSystemService(Context.UI_MODE_SERVICE);
         assertNotNull(mUiModeManager);
+        // reset nightMode
+        setNightMode(UiModeManager.MODE_NIGHT_YES);
+        setNightMode(UiModeManager.MODE_NIGHT_NO);
     }
 
     public void testUiMode() throws Exception {
@@ -83,7 +84,6 @@
         }
     }
 
-    @Suppress //("b/146764875")
     public void testNightModeYesPersisted() throws InterruptedException {
         // Reset the mode to no if it is set to another value
         setNightMode(UiModeManager.MODE_NIGHT_NO);
@@ -92,7 +92,6 @@
         assertStoredNightModeSetting(UiModeManager.MODE_NIGHT_YES);
     }
 
-    @Suppress //("b/146764875")
     public void testNightModeAutoPersisted() throws InterruptedException {
         // Reset the mode to no if it is set to another value
         setNightMode(UiModeManager.MODE_NIGHT_NO);
@@ -101,6 +100,16 @@
         assertStoredNightModeSetting(UiModeManager.MODE_NIGHT_AUTO);
     }
 
+    public void testNightModeAutoNotPersistedCarMode() {
+        // Reset the mode to no if it is set to another value
+        setNightMode(UiModeManager.MODE_NIGHT_NO);
+        mUiModeManager.enableCarMode(0);
+
+        setNightMode(UiModeManager.MODE_NIGHT_AUTO);
+        assertStoredNightModeSetting(UiModeManager.MODE_NIGHT_NO);
+        mUiModeManager.disableCarMode(0);
+    }
+
     public void testNightModeInCarModeIsTransient() {
         if (mUiModeManager.isNightModeLocked()) {
             return;