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

Commit e178c24d authored by Ashwini Oruganti's avatar Ashwini Oruganti Committed by Jeff Sharkey
Browse files

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.

These changes were made using an automated tool, the xml file may be
reformatted slightly creating a larger diff. The only "real" change is
the addition of "android:exported" to activities, services, and
receivers that have one or more intent-filters.

Bug: 150232615
Test: TH
Exempt-From-Owner-Approval: mechanical refactoring
Change-Id: I4457ff2bd466a4c56fed2570e110f251031c2385
parent ed91e913

core/res/AndroidManifest.xml

+21 −1
Original line number Diff line number Diff line
@@ -5044,6 +5044,7 @@ 
                android:relinquishTaskIdentity="true"

                android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"

                android:process=":ui"

                android:exported="true"

                android:visibleToInstantApps="true">

            <intent-filter>

                <action android:name="android.intent.action.CHOOSER" />
@@ -5155,6 +5156,7 @@ 
        <activity android:name="com.android.internal.app.ShutdownActivity"

            android:permission="android.permission.SHUTDOWN"

            android:theme="@style/Theme.NoDisplay"

            android:exported="true"

            android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="com.android.internal.intent.action.REQUEST_SHUTDOWN" />
@@ -5176,6 +5178,7 @@ 
                  android:enabled="false"

                  android:process=":ui"

                  android:systemUserOnly="true"

                  android:exported="true"

                  android:theme="@style/Theme.Translucent.NoTitleBar">

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

                <action android:name="android.intent.action.MAIN" />
@@ -5188,6 +5191,7 @@ 
        <activity android:name="com.android.internal.app.ConfirmUserCreationActivity"

                android:excludeFromRecents="true"

                android:process=":ui"

                android:exported="true"

                android:theme="@style/Theme.Dialog.Confirmation">

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

                <action android:name="android.os.action.CREATE_USER" />
@@ -5228,6 +5232,7 @@ 
        </activity>



        <receiver android:name="com.android.server.BootReceiver"

                android:exported="true"

                android:systemUserOnly="true">

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

                <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -5235,6 +5240,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.CertPinInstallReceiver"

                android:exported="true"

                android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_PINS" />
@@ -5243,6 +5249,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.IntentFirewallInstallReceiver"

                android:exported="true"

                android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_INTENT_FIREWALL" />
@@ -5251,6 +5258,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.SmsShortCodesInstallReceiver"

                android:exported="true"

                android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_SMS_SHORT_CODES" />
@@ -5259,6 +5267,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.NetworkWatchlistInstallReceiver"

                  android:exported="true"

                  android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_NETWORK_WATCHLIST" />
@@ -5267,6 +5276,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.ApnDbInstallReceiver"

                android:exported="true"

                android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="com.android.internal.intent.action.UPDATE_APN_DB" />
@@ -5275,6 +5285,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.CarrierProvisioningUrlsInstallReceiver"

                android:exported="true"

                android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS" />
@@ -5283,6 +5294,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.CertificateTransparencyLogInstallReceiver"

                android:exported="true"

                android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_CT_LOGS" />
@@ -5291,6 +5303,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.LangIdInstallReceiver"

                android:exported="true"

                android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_LANG_ID" />
@@ -5299,6 +5312,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.SmartSelectionInstallReceiver"

                android:exported="true"

                android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_SMART_SELECTION" />
@@ -5307,6 +5321,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.ConversationActionsInstallReceiver"

                  android:exported="true"

                  android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.intent.action.UPDATE_CONVERSATION_ACTIONS" />
@@ -5315,6 +5330,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.CarrierIdInstallReceiver"

                  android:exported="true"

                  android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.os.action.UPDATE_CARRIER_ID_DB" />
@@ -5323,6 +5339,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.updates.EmergencyNumberDbInstallReceiver"

                  android:exported="true"

                  android:permission="android.permission.UPDATE_CONFIG">

            <intent-filter>

                <action android:name="android.os.action.UPDATE_EMERGENCY_NUMBER_DB" />
@@ -5331,6 +5348,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.MasterClearReceiver"

            android:exported="true"

            android:permission="android.permission.MASTER_CLEAR">

            <intent-filter

                    android:priority="100" >
@@ -5347,6 +5365,7 @@ 
        </receiver>



        <receiver android:name="com.android.server.WallpaperUpdateReceiver"

                  android:exported="true"

                  android:permission="android.permission.RECEIVE_DEVICE_CUSTOMIZATION_READY">

            <intent-filter>

                <action android:name="android.intent.action.DEVICE_CUSTOMIZATION_READY"/>
@@ -5443,7 +5462,8 @@ 
                 android:permission="android.permission.BIND_JOB_SERVICE">

        </service>



        <service android:name="com.android.server.pm.PackageManagerShellCommandDataLoader">

        <service android:name="com.android.server.pm.PackageManagerShellCommandDataLoader"

            android:exported="true">

            <intent-filter>

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

            </intent-filter>

core/tests/coretests/AndroidManifest.xml

+330 −155

File changed.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/EnabledTestApp/AndroidManifest.xml

+26 −17
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

     package="com.android.frameworks.coretests.enabled_app"

     android:sharedUserId="com.android.uid.test">
@@ -20,27 +21,35 @@ 
    <application>



        <!-- Used to test package component enabling and disabling -->

        <activity android:name=".DisabledActivity" android:enabled="false" >

        <activity android:name=".DisabledActivity"

             android:enabled="false"

             android:exported="true">

            <intent-filter>

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

                <category android:name="com.android.frameworks.coretests.enabled_app.TEST_CATEGORY"/>

            </intent-filter>

        </activity>

        <service android:name=".DisabledService" android:enabled="false" >

        <service android:name=".DisabledService"

             android:enabled="false">

        </service>

        <receiver android:name=".DisabledReceiver" android:enabled="false" >

        <receiver android:name=".DisabledReceiver"

             android:enabled="false"

             android:exported="true">

            <intent-filter>

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

            </intent-filter>

        </receiver>

        <provider android:name=".DisabledProvider" android:enabled="false"

        <provider android:name=".DisabledProvider"

             android:enabled="false"

             android:authorities="com.android.frameworks.coretests.enabled_app.DisabledProvider"

             android:process=":disabled.provider.process"/>

        <activity android:name=".EnabledActivity">

        </activity>

        <service android:name=".EnabledService" android:enabled="true" >

        <service android:name=".EnabledService"

             android:enabled="true">

        </service>

        <receiver android:name=".EnabledReceiver" >

        <receiver android:name=".EnabledReceiver"

             android:exported="true">

            <intent-filter>

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

            </intent-filter>

core/tests/coretests/apks/install_jni_lib_open_from_apk/AndroidManifest.xml

+9 −5
Original line number Diff line number Diff line
@@ -13,12 +13,16 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

     package="com.android.frameworks.coretests.install_jni_lib_open_from_apk">



    <application android:hasCode="true" android:label="@string/app_name" android:extractNativeLibs="false">

    <application android:hasCode="true"

         android:label="@string/app_name"

         android:extractNativeLibs="false">

        <activity android:name="com.android.frameworks.coretests.OpenFromApkActivity"

           android:label="@string/app_name">

             android:label="@string/app_name"

             android:exported="true">

          <intent-filter>

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

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

core/tests/hosttests/test-apps/MultiDexLegacyAndException/AndroidManifest.xml

+20 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

     package="com.android.multidexlegacyandexception"

     android:versionCode="1"

     android:versionName="1.0">



    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18"/>

    <uses-sdk android:minSdkVersion="8"

         android:targetSdkVersion="18"/>



    <application

        android:name="com.android.multidexlegacyandexception.TestApplication"

        android:label="multidexlegacyandexception"

        >

        <activity

            android:name="com.android.multidexlegacyandexception.MainActivity"

    <application android:name="com.android.multidexlegacyandexception.TestApplication"

         android:label="multidexlegacyandexception">

        <activity android:name="com.android.multidexlegacyandexception.MainActivity"

             android:label="multidexlegacyandexception"

             android:exported="true">

            <intent-filter>

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