commit f1e9db0cbe0c896e62abb36db84b58a01d2b33a2
author Tadashi G. Takaoka <takaoka@google.com> Tue Nov 06 16:57:36 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 06 16:57:36 2018 +0000
tree 4aa86ecc8e40bbb6a21dd1a575c9f84da660d767
parent c90f30d1d983a7700cd3a65461abda329d7e10e6
parent 0b590e6ab918b33e722a55579d7bc07e566279b2

Merge "Fix missing showWhenLocked activity attribute"

services/tests/servicestests/AndroidManifest.xml

diff --git a/services/tests/servicestests/AndroidManifest.xml b/services/tests/servicestests/AndroidManifest.xml
index d46b991..13ba229 100644
--- a/services/tests/servicestests/AndroidManifest.xml
+++ b/services/tests/servicestests/AndroidManifest.xml
@@ -143,7 +143,8 @@
         <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity2" />
         <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity3" />
 
-        <activity android:name="com.android.server.wm.ScreenDecorWindowTests$TestActivity" />
+        <activity android:name="com.android.server.wm.ScreenDecorWindowTests$TestActivity"
+                  android:showWhenLocked="true" />
 
         <activity android:name="com.android.server.pm.ShortcutTestActivity"
                  android:enabled="true" android:exported="true" />