Merge "Fix missing showWhenLocked activity attribute"

am: f1e9db0cbe

Change-Id: If921e3c02dc5c3604f4c67c77666f85cefd69846
This commit is contained in:
Tadashi G. Takaoka
2018-11-06 09:06:46 -08:00
committed by android-build-merger

View File

@@ -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" />