commit 658e140263844625237567c5ad52a08072ff3c96
author Sergey Nikolaienkov <sergeynv@google.com> Wed Jun 24 08:30:23 2020 +0200
committer Sergey Nikolaienkov <sergeynv@google.com> Wed Jun 24 08:30:34 2020 +0200
tree 54119b970ac0baa8e5f2423ac6aecd6d21d2225b
parent 3ab91c685b315b778ed6b53780e31210e568c1b2

Fix testNightModeAutoNotPersistedCarMode

Fixing UiModeManagerTest#testNightModeAutoNotPersistedCarMode on devices
with locked night mode.

Bug: 159700716
Bug: 159686230
Test: atest UiModeManagerTest#testNightModeAutoNotPersistedCarMode
Change-Id: I7eeb46beb61ad1d9d1df9ab379347bcb86770150

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 7174f36..e877350 100644
--- a/tests/app/src/android/app/cts/UiModeManagerTest.java
+++ b/tests/app/src/android/app/cts/UiModeManagerTest.java
@@ -124,6 +124,10 @@
     }
 
     public void testNightModeAutoNotPersistedCarMode() {
+        if (mUiModeManager.isNightModeLocked()) {
+            return;
+        }
+
         // Reset the mode to no if it is set to another value
         setNightMode(UiModeManager.MODE_NIGHT_NO);
         mUiModeManager.enableCarMode(0);