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

Commit 71a59f30 authored by Ashwini Oruganti's avatar Ashwini Oruganti
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 future versions. 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: Iad59f76f644dbd271f46b85f68580d18ec6de2fd
parent b1e0af7b

AndroidManifest.xml

+18 −2
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
            android:launchMode="singleTop"

            android:resizeableActivity="true"

            android:theme="@style/LaunchScreenTheme"

            android:exported="true"

            android:visibleToInstantApps="true"

            >

            <intent-filter>
@@ -183,6 +184,7 @@ 
            android:theme="@style/ContactPickerTheme"

            android:uiOptions="splitActionBarWhenNarrow"

            android:windowSoftInputMode="adjustResize"

            android:exported="true"

            android:visibleToInstantApps="true">

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

                android:value="true" />
@@ -285,6 +287,7 @@ 


        <activity

            android:name=".activities.ShowOrCreateActivity"

            android:exported="true"

            android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">



            <intent-filter>
@@ -302,6 +305,7 @@ 
            android:launchMode="singleTop"

            android:taskAffinity=""

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

            android:exported="true"

            android:windowSoftInputMode="stateUnchanged">



            <intent-filter>
@@ -330,7 +334,8 @@ 


        <!-- Responsible for creating notification channels when boot is completed or when app is

        re-installed -->

        <receiver android:name=".interactions.OnBootOrUpgradeReceiver">

        <receiver android:name=".interactions.OnBootOrUpgradeReceiver"

            android:exported="true">

            <intent-filter>

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

                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
@@ -341,6 +346,7 @@ 
            android:name="ContactShortcut"

            android:icon="@drawable/logo_quick_contacts_color_44in48dp"

            android:label="@string/shortcutContact"

            android:exported="true"

            android:targetActivity=".activities.ContactSelectionActivity">



            <intent-filter>
@@ -354,6 +360,7 @@ 
            android:name="alias.DialShortcut"

            android:icon="@drawable/logo_quick_contacts_dialer_color_44in48dp"

            android:label="@string/shortcutDialContact"

            android:exported="true"

            android:targetActivity=".activities.ContactSelectionActivity">



            <intent-filter>
@@ -369,6 +376,7 @@ 
            android:name="alias.MessageShortcut"

            android:icon="@drawable/logo_quick_contacts_mail_color_44in48dp"

            android:label="@string/shortcutMessageContact"

            android:exported="true"

            android:targetActivity=".activities.ContactSelectionActivity">



            <intent-filter>
@@ -388,6 +396,7 @@ 
        <!-- Edit or create a contact with only the most important fields displayed initially. -->

        <activity

            android:name=".activities.ContactEditorActivity"

            android:exported="true"

            android:theme="@style/EditorActivityTheme">



            <intent-filter>
@@ -417,6 +426,7 @@ 


        <activity

            android:name=".activities.ContactEditorSpringBoardActivity"

            android:exported="true"

            android:theme="@style/TransparentThemeAppCompat">



            <intent-filter>
@@ -429,7 +439,8 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".test.FragmentTestActivity">

        <activity android:name=".test.FragmentTestActivity"

            android:exported="true">

            <intent-filter>

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

            </intent-filter>
@@ -455,6 +466,7 @@ 
        <activity

            android:name=".activities.AttachPhotoActivity"

            android:label="@string/attach_photo_dialog_title"

            android:exported="true"

            android:taskAffinity="">

            <intent-filter>

                <action android:name="android.intent.action.ATTACH_DATA"/>
@@ -467,6 +479,7 @@ 
        <activity

            android:name=".vcard.ImportVCardActivity"

            android:configChanges="orientation|screenSize|keyboardHidden"

            android:exported="true"

            android:theme="@style/BackgroundOnlyTheme">

            <intent-filter>

                <action android:name="android.intent.action.VIEW"/>
@@ -482,6 +495,7 @@ 
        <activity

            android:name=".vcard.NfcImportVCardActivity"

            android:configChanges="orientation|screenSize|keyboardHidden"

            android:exported="true"

            android:theme="@style/BackgroundOnlyTheme">

            <intent-filter>

                <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
@@ -527,6 +541,7 @@ 
             are set lower, so that the user does not see a disambig dialog -->

        <activity

            android:name="com.android.contacts.NonPhoneActivity"

            android:exported="true"

            android:theme="@style/NonPhoneActivityTheme">

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

                <action android:name="android.intent.action.MAIN"/>
@@ -555,6 +570,7 @@ 
        <activity

            android:name="com.android.contacts.dialog.CallSubjectDialog"

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

            android:exported="true"

            android:windowSoftInputMode="stateVisible|adjustResize">

            <intent-filter>

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

tests/AndroidManifest.xml

+4 −2
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ 
        <uses-library android:name="android.test.runner" />

        <meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" />



        <activity android:name=".allintents.AllIntentsActivity">

        <activity android:name=".allintents.AllIntentsActivity"

            android:exported="true">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />
@@ -48,7 +49,8 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".allintents.ResultActivity">

        <activity android:name=".allintents.ResultActivity"

            android:exported="true">

            <intent-filter>

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

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