Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2e5daf2 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by android-build-merger
Browse files

Merge "Fix missing showWhenLocked activity attribute" am: f1e9db0c 

am: cfbbe2d8

Change-Id: I93f86f0da6a557065a83044fcd77eb31eda8ce29
parents d0654f1d cfbbe2d8

services/tests/servicestests/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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" />