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

Commit cde3954b authored by Ashwini Oruganti's avatar Ashwini Oruganti
Browse files

CtsShim: Add an exported flag in manifest 

With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.

Bug: 150232615
Test: TH
Change-Id: Ieab993508f18c148ca771df7faf7bbc845f52ad8
parent 72fcef13

packages/CtsShim/build/shim/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ 
        <!-- These activities don't actually exist; define them just to test the filters !-->



        <!-- install test; high priority filter DENIED -->

        <activity android:name=".InstallPriority">

        <activity android:name=".InstallPriority"

            android:exported="true">

            <intent-filter android:priority="100">

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

                <category android:name="android.intent.category.INFO" />

packages/CtsShim/build/shim_priv/AndroidManifest.xml

+24 −12
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
        <!-- These activities don't actually exist; define them just to test the filters !-->



        <!-- install test; [some] high priority filters granted -->

        <activity android:name=".InstallPriority">

        <activity android:name=".InstallPriority"

            android:exported="true">

            <!-- normal actions; priority will be granted -->

            <intent-filter android:priority="100">

                <action android:name="android.intent.action.SEARCH" />
@@ -57,7 +58,8 @@ 
        </activity>



        <!-- upgrade test; single, equivalent filter -->

        <activity android:name=".UpgradeMatch">

        <activity android:name=".UpgradeMatch"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.MATCH" />

                <category android:name="android.intent.category.INFO" />
@@ -65,7 +67,8 @@ 
        </activity>



        <!-- upgrade test; multiple, equivalent filters -->

        <activity android:name=".UpgradeMatchMultiple">

        <activity android:name=".UpgradeMatchMultiple"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.MATCH_MULTIPLE" />

                <category android:name="android.intent.category.INFO" />
@@ -83,7 +86,8 @@ 
        </activity>



        <!-- upgrade test; lower priority -->

        <activity android:name=".UpgradeLowerPriority">

        <activity android:name=".UpgradeLowerPriority"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.LOWER_PRIORITY" />

                <category android:name="android.intent.category.INFO" />
@@ -91,7 +95,8 @@ 
        </activity>



        <!-- upgrade test; action subset -->

        <activity android:name=".UpgradeActionSubset">

        <activity android:name=".UpgradeActionSubset"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.ACTION_SUB" />

                <action android:name="com.android.cts.action.ACTION_SUB_2" />
@@ -101,7 +106,8 @@ 
        </activity>



        <!-- upgrade test; category subset -->

        <activity android:name=".UpgradeCategorySubset">

        <activity android:name=".UpgradeCategorySubset"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.CATEGORY_SUB" />

                <category android:name="android.intent.category.INFO" />
@@ -110,7 +116,8 @@ 
        </activity>



        <!-- upgrade test; scheme subset -->

        <activity android:name=".UpgradeSchemeSubset">

        <activity android:name=".UpgradeSchemeSubset"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.SCHEME_SUB" />

                <data android:scheme="content" />
@@ -120,7 +127,8 @@ 
        </activity>



        <!-- upgrade test; authority subset -->

        <activity android:name=".UpgradeAuthoritySubset">

        <activity android:name=".UpgradeAuthoritySubset"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.AUTHORITY_SUB" />

                <data android:host="www.google.com" android:port="80" />
@@ -132,7 +140,8 @@ 




        <!-- upgrade test; new action -->

        <activity android:name=".UpgradeNewAction">

        <activity android:name=".UpgradeNewAction"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.NEW_ACTION" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -140,7 +149,8 @@ 
        </activity>



        <!-- upgrade test; new category -->

        <activity android:name=".UpgradeNewCategory">

        <activity android:name=".UpgradeNewCategory"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.NEW_CATEGORY" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -148,7 +158,8 @@ 
        </activity>



        <!-- upgrade test; new scheme -->

        <activity android:name=".UpgradeNewScheme">

        <activity android:name=".UpgradeNewScheme"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.NEW_SCHEME" />

                <data android:scheme="content" />
@@ -156,7 +167,8 @@ 
        </activity>



        <!-- upgrade test; new authority -->

        <activity android:name=".UpgradeNewAuthority">

        <activity android:name=".UpgradeNewAuthority"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.NEW_AUTHORITY" />

                <data android:host="www.google.com" android:port="80" />

packages/CtsShim/build/shim_priv_upgrade/AndroidManifest.xml

+26 −13
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
        <!-- These activities don't actually exist; define them just to test the filters !-->



        <!-- install test; [some] high priority filters granted -->

        <activity android:name=".InstallPriority">

        <activity android:name=".InstallPriority"

            android:exported="true">

            <!-- normal actions; priority will be granted -->

            <intent-filter android:priority="100">

                <action android:name="android.intent.action.SEARCH" />
@@ -54,7 +55,8 @@ 
        </activity>



        <!-- upgrade test; single, equivalent filter -->

        <activity android:name=".UpgradeMatch">

        <activity android:name=".UpgradeMatch"

            android:exported="true">

            <intent-filter android:priority="500">

                <action android:name="com.android.cts.action.MATCH" />

                <category android:name="android.intent.category.INFO" />
@@ -62,14 +64,16 @@ 
        </activity>



        <!-- upgrade test; multiple, equivalent filters -->

        <activity android:name=".UpgradeMatchMultiple">

        <activity android:name=".UpgradeMatchMultiple"

            android:exported="true">

            <intent-filter android:priority="500">

                <action android:name="com.android.cts.action.MATCH_MULTIPLE" />

            </intent-filter>

        </activity>



        <!-- upgrade test; lower priority is okay -->

        <activity android:name=".UpgradeLowerPriority">

        <activity android:name=".UpgradeLowerPriority"

            android:exported="true">

            <intent-filter android:priority="75">

                <action android:name="com.android.cts.action.LOWER_PRIORITY" />

                <category android:name="android.intent.category.INFO" />
@@ -77,7 +81,8 @@ 
        </activity>



        <!-- upgrade test; action subset is "equivalent" -->

        <activity android:name=".UpgradeActionSubset">

        <activity android:name=".UpgradeActionSubset"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.ACTION_SUB_2" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -85,7 +90,8 @@ 
        </activity>



        <!-- upgrade test; category subset is "equivalent" -->

        <activity android:name=".UpgradeCategorySubset">

        <activity android:name=".UpgradeCategorySubset"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.CATEGORY_SUB" />

                <category android:name="android.intent.category.INFO" />
@@ -93,7 +99,8 @@ 
        </activity>



        <!-- upgrade test; scheme subset is "equivalent" -->

        <activity android:name=".UpgradeSchemeSubset">

        <activity android:name=".UpgradeSchemeSubset"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.SCHEME_SUB" />

                <data android:scheme="flubber" />
@@ -101,7 +108,8 @@ 
        </activity>



        <!-- upgrade test; authority subset is "equivalent" -->

        <activity android:name=".UpgradeAuthoritySubset">

        <activity android:name=".UpgradeAuthoritySubset"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.AUTHORITY_SUB" />

                <data android:host="goo.gl" android:port="443" />
@@ -109,7 +117,8 @@ 
        </activity>



        <!-- upgrade test; new activity cannot get >0 priority -->

        <activity android:name=".UpgradeNewActivity">

        <activity android:name=".UpgradeNewActivity"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.NEW_ACTIVITY" />

                <category android:name="android.intent.category.INFO" />
@@ -117,7 +126,8 @@ 
        </activity>



        <!-- upgrade test; new action cannot get >0 priority -->

        <activity android:name=".UpgradeNewAction">

        <activity android:name=".UpgradeNewAction"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.NEW_ACTION" />

                <action android:name="com.android.cts.action.NEW_ACTION_2" />
@@ -125,7 +135,8 @@ 
        </activity>



        <!-- upgrade test; new category cannot get >0 priority -->

        <activity android:name=".UpgradeNewCategory">

        <activity android:name=".UpgradeNewCategory"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.NEW_CATEGORY" />

                <category android:name="android.intent.category.INFO" />
@@ -135,7 +146,8 @@ 
        </activity>



        <!-- upgrade test; new scheme cannot get >0 priority -->

        <activity android:name=".UpgradeNewScheme">

        <activity android:name=".UpgradeNewScheme"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.NEW_SCHEME" />

                <data android:scheme="content" />
@@ -146,7 +158,8 @@ 
        </activity>



        <!-- upgrade test; new authority cannot get >0 priority -->

        <activity android:name=".UpgradeNewAuthority">

        <activity android:name=".UpgradeNewAuthority"

            android:exported="true">

            <intent-filter android:priority="100">

                <action android:name="com.android.cts.action.NEW_AUTHORITY" />

                <data android:host="www.google.com" android:port="80" />