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

Commit cd6409b8 authored by Viesturs Zarins's avatar Viesturs Zarins Committed by Automerger Merge Worker
Browse files

Merge "Fix missing Activity embedding allowlisting for Assistant. The normal... 

Merge "Fix missing Activity embedding allowlisting for Assistant. The normal settings fragments are already allowlisted via SubSettingActivity. ManageApplications fragment based activities are not compatible with that however." into udc-d1-dev am: 8e9955a4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23262238



Change-Id: I2829a6386bc5e9b710e2e4dc62636aa9493a6f8f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b04b977c 8e9955a4

AndroidManifest.xml

+17 −0
Original line number Diff line number Diff line
@@ -864,6 +864,7 @@ 


        <activity

            android:name="Settings$LongBackgroundTasksActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/long_background_tasks_label">

            <intent-filter android:priority="1">
@@ -1545,6 +1546,7 @@ 


        <activity

            android:name="Settings$ManageApplicationsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/applications_settings">

            <intent-filter android:priority="1">
@@ -1607,6 +1609,7 @@ 


        <activity

            android:name="Settings$HighPowerApplicationsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/high_power_apps">

            <intent-filter android:priority="1">
@@ -1665,6 +1668,7 @@ 
             This is for compatibility with old shortcuts. -->

        <activity-alias android:name=".RunningServices"

                android:label="@string/runningservices_settings_title"

                android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                android:exported="true"

                android:targetActivity="Settings$ManageApplicationsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1677,6 +1681,7 @@ 
             This is for compatibility with old shortcuts. -->

        <activity-alias android:name=".applications.StorageUse"

                android:label="@string/storageuse_settings_title"

                android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                android:exported="true"

                android:targetActivity="Settings$ManageApplicationsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1743,6 +1748,7 @@ 
        <!-- Provide direct entry into manage apps showing running services. -->

        <activity android:name="Settings$RunningServicesActivity"

                android:exported="true"

                android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                android:label="@string/runningservices_settings_title">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -1761,6 +1767,7 @@ 
        <!-- Provide direct entry into manage apps showing storage usage of apps. -->

        <activity

            android:name="Settings$StorageUseActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/storageuse_settings_title">

            <intent-filter android:priority="1">
@@ -2105,6 +2112,7 @@ 


        <activity

            android:name="Settings$UsageAccessSettingsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/usage_access_title">

            <intent-filter android:priority="1">
@@ -3483,6 +3491,7 @@ 
        <activity

            android:name="Settings$TurnScreenOnSettingsActivity"

            android:exported="true"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:label="@string/turn_screen_on_title">

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

                <action android:name="android.settings.TURN_SCREEN_ON_SETTINGS" />
@@ -3662,6 +3671,7 @@ 
        <activity android:name="Settings$NotificationAppListActivity"

                  android:label="@string/app_notifications_title"

                  android:icon="@drawable/ic_notifications"

                  android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                  android:exported="true">

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

                <action android:name="android.settings.ALL_APPS_NOTIFICATION_SETTINGS" />
@@ -3676,6 +3686,7 @@ 
        <!-- Displays a list of apps available for cloning on the device -->

        <activity android:name=".Settings$ClonedAppsListActivity"

                  android:label="@string/cloned_apps_dashboard_title"

                  android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

                  android:exported="true">

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

                <action android:name="android.settings.MANAGE_CLONED_APPS_SETTINGS" />
@@ -3941,6 +3952,7 @@ 


        <activity

            android:name="Settings$OverlaySettingsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/draw_overlay">

            <intent-filter android:priority="1">
@@ -3978,6 +3990,7 @@ 


        <activity

            android:name="Settings$WriteSettingsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/write_settings_title">

            <intent-filter android:priority="1">
@@ -4011,6 +4024,7 @@ 
        <activity

            android:name="Settings$AlarmsAndRemindersActivity"

            android:exported="true"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:label="@string/alarms_and_reminders_label">

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

                <action android:name="android.settings.REQUEST_SCHEDULE_EXACT_ALARM" />
@@ -4041,6 +4055,7 @@ 


        <activity

            android:name="Settings$ManageExternalSourcesActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/install_other_apps">

            <intent-filter android:priority="1">
@@ -4095,6 +4110,7 @@ 


        <activity

            android:name="Settings$ManageExternalStorageActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/manage_external_storage_title">

            <intent-filter android:priority="1">
@@ -4126,6 +4142,7 @@ 


        <activity

            android:name="Settings$MediaManagementAppsActivity"

            android:knownActivityEmbeddingCerts="@array/config_known_host_certs"

            android:exported="true"

            android:label="@string/media_management_apps_title">

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