commit 5df72f0a13e7d705fef4517d616b156a2866cd48
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 03 18:51:38 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 03 18:51:38 2019 +0000
tree 069cfc40440fa828c1796abe6a84b36565d173a7
parent 951115c6046c5fdf007ae3d2b187a80eb4854e00
parent 050037669cddb691abc71b97f1576531043d5b12

Merge "Remove hardcoding of system user" into qt-dev

tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java

diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java b/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java
index 4368e87..8601d35 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java
@@ -1065,7 +1065,8 @@
             // puts the device to sleep, but kept around for clarity.
             getInstrumentation().getUiAutomation().performGlobalAction(
                     AccessibilityService.GLOBAL_ACTION_LOCK_SCREEN);
-            if (mAmbientDisplayConfiguration.alwaysOnEnabled(UserHandle.SYSTEM.getIdentifier())) {
+            if (mAmbientDisplayConfiguration.alwaysOnEnabled(
+                    android.os.Process.myUserHandle().getIdentifier())) {
                 mAmWmState.waitForAodShowing();
             } else {
                 for (int retry = 1; isDisplayOn(DEFAULT_DISPLAY) && retry <= 5; retry++) {