Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix missing showWhenLocked activity attribute"

Browse Source 
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
parent ad370ddf38 f1e9db0cbe
commit cfbbe2d89d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/tests/servicestests/AndroidManifest.xml
View File

@@ -143,7 +143,8 @@
<activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity2" /> <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity2" />
<activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity3" /> <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" <activity android:name="com.android.server.pm.ShortcutTestActivity"
android:enabled="true" android:exported="true" /> android:enabled="true" android:exported="true" />