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

Merge "servicetests: Whitespace updates" into rvc-dev am: 3b4d9c9fca

Browse Source 
Change-Id: I1c3136291a18b56627ea36f373f6832d10db0490
This commit is contained in:
TreeHugger Robot
2020-03-25 01:29:35 +00:00
committed by Automerger Merge Worker
parent 139bd905da 3b4d9c9fca
commit 2a31bd45bd
1 changed files with 124 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,8 @@
<activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity3"/> <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity3"/>
<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"/>
<activity android:name="com.android.server.pm.SuspendedDetailsActivity" <activity android:name="com.android.server.pm.SuspendedDetailsActivity"
android:enabled="true" android:enabled="true"
@@ -172,22 +173,29 @@
<activity-alias android:name="a.ShortcutEnabled" <activity-alias android:name="a.ShortcutEnabled"
android:targetActivity="com.android.server.pm.ShortcutTestActivity" android:targetActivity="com.android.server.pm.ShortcutTestActivity"
android:enabled="true" android:exported="true"> android:enabled="true"
android:exported="true">
</activity-alias> </activity-alias>
<activity-alias android:name="a.ShortcutDisabled" <activity-alias android:name="a.ShortcutDisabled"
android:targetActivity="com.android.server.pm.ShortcutTestActivity" android:targetActivity="com.android.server.pm.ShortcutTestActivity"
android:enabled="false" android:exported="true"> android:enabled="false"
<meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_5"/> android:exported="true">
<meta-data android:name="android.app.shortcuts"
android:resource="@xml/shortcut_5"/>
</activity-alias> </activity-alias>
<activity-alias android:name="a.ShortcutUnexported" <activity-alias android:name="a.ShortcutUnexported"
android:targetActivity="com.android.server.pm.ShortcutTestActivity" android:targetActivity="com.android.server.pm.ShortcutTestActivity"
android:enabled="true" android:exported="false"> android:enabled="true"
<meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_5"/> android:exported="false">
<meta-data android:name="android.app.shortcuts"
android:resource="@xml/shortcut_5"/>
</activity-alias> </activity-alias>
<activity-alias android:name="a.Shortcut1" <activity-alias android:name="a.Shortcut1"
android:targetActivity="com.android.server.pm.ShortcutTestActivity" android:targetActivity="com.android.server.pm.ShortcutTestActivity"
android:enabled="true" android:exported="true"> android:enabled="true"
<meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_1"/> android:exported="true">
<meta-data android:name="android.app.shortcuts"
android:resource="@xml/shortcut_1"/>
</activity-alias> </activity-alias>
<activity-alias android:name="a.ShortcutConfigActivity" <activity-alias android:name="a.ShortcutConfigActivity"
android:targetActivity="com.android.server.pm.ShortcutTestActivity"> android:targetActivity="com.android.server.pm.ShortcutTestActivity">
@@ -198,7 +206,8 @@
<activity-alias android:name="a.DisabledMain" <activity-alias android:name="a.DisabledMain"
android:targetActivity="com.android.server.pm.ShortcutTestActivity" android:targetActivity="com.android.server.pm.ShortcutTestActivity"
android:enabled="false" android:exported="true"> android:enabled="false"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
@@ -208,7 +217,8 @@
<activity-alias android:name="a.UnexportedMain" <activity-alias android:name="a.UnexportedMain"
android:targetActivity="com.android.server.pm.ShortcutTestActivity" android:targetActivity="com.android.server.pm.ShortcutTestActivity"
android:enabled="true" android:exported="false"> android:enabled="true"
android:exported="false">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
@@ -225,8 +235,7 @@
</receiver> </receiver>
</application> </application>
<instrumentation <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.frameworks.servicestests" android:targetPackage="com.android.frameworks.servicestests"
android:label="Frameworks Services Tests"/> android:label="Frameworks Services Tests"/>
</manifest> </manifest>