commit 93d923a2980a4e93a3c71dbfbad068cc0bbcd4c8
author Tadashi G. Takaoka <takaoka@google.com> Tue Nov 06 13:42:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 06 13:42:26 2018 +0000
tree ab8fa2ee3c39d62479304c5226c6794eeef404e1
parent b1eeab34a658b9b592452328c2011ce4e02fc98b
parent aaa15aebcc8819a82a7cddb434833aad274be510

Merge "Fix missing showWhenLocked activity attribute"

services/tests/wmtests/AndroidManifest.xml

diff --git a/services/tests/wmtests/AndroidManifest.xml b/services/tests/wmtests/AndroidManifest.xml
index 73a34b6..ff84803 100644
--- a/services/tests/wmtests/AndroidManifest.xml
+++ b/services/tests/wmtests/AndroidManifest.xml
@@ -41,7 +41,8 @@
         <activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityRequestedOrientationChange" />
         <activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityTaskChangeCallbacks" />
         <activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityTaskDescriptionChange" />
-        <activity android:name="com.android.server.wm.ScreenDecorWindowTests$TestActivity" />
+        <activity android:name="com.android.server.wm.ScreenDecorWindowTests$TestActivity"
+                  android:showWhenLocked="true" />
     </application>
 
     <instrumentation