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

Commit 2a31bd45 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I1c3136291a18b56627ea36f373f6832d10db0490
parents 139bd905 3b4d9c9f

services/tests/servicestests/AndroidManifest.xml

+125 −116
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ 
        <activity android:name="com.android.server.pm.BaseShortcutManagerTest$ShortcutActivity3"/>



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

             android:enabled="true"
@@ -172,22 +173,29 @@ 


        <activity-alias android:name="a.ShortcutEnabled"

             android:targetActivity="com.android.server.pm.ShortcutTestActivity"

            android:enabled="true" android:exported="true">

             android:enabled="true"

             android:exported="true">

        </activity-alias>

        <activity-alias android:name="a.ShortcutDisabled"

             android:targetActivity="com.android.server.pm.ShortcutTestActivity"

            android:enabled="false" android:exported="true">

            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_5"/>

             android:enabled="false"

             android:exported="true">

            <meta-data android:name="android.app.shortcuts"

                 android:resource="@xml/shortcut_5"/>

        </activity-alias>

        <activity-alias android:name="a.ShortcutUnexported"

             android:targetActivity="com.android.server.pm.ShortcutTestActivity"

            android:enabled="true" android:exported="false">

            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_5"/>

             android:enabled="true"

             android:exported="false">

            <meta-data android:name="android.app.shortcuts"

                 android:resource="@xml/shortcut_5"/>

        </activity-alias>

        <activity-alias android:name="a.Shortcut1"

             android:targetActivity="com.android.server.pm.ShortcutTestActivity"

            android:enabled="true" android:exported="true">

            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcut_1"/>

             android:enabled="true"

             android:exported="true">

            <meta-data android:name="android.app.shortcuts"

                 android:resource="@xml/shortcut_1"/>

        </activity-alias>

        <activity-alias android:name="a.ShortcutConfigActivity"

             android:targetActivity="com.android.server.pm.ShortcutTestActivity">
@@ -198,7 +206,8 @@ 


        <activity-alias android:name="a.DisabledMain"

             android:targetActivity="com.android.server.pm.ShortcutTestActivity"

            android:enabled="false" android:exported="true">

             android:enabled="false"

             android:exported="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.DEFAULT"/>
@@ -208,7 +217,8 @@ 


        <activity-alias android:name="a.UnexportedMain"

             android:targetActivity="com.android.server.pm.ShortcutTestActivity"

            android:enabled="true" android:exported="false">

             android:enabled="true"

             android:exported="false">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

                <category android:name="android.intent.category.DEFAULT"/>
@@ -225,8 +235,7 @@ 
        </receiver>

    </application>



    <instrumentation

        android:name="androidx.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

         android:targetPackage="com.android.frameworks.servicestests"

         android:label="Frameworks Services Tests"/>

</manifest>