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

Commit 9507bdb3 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "overlay_packages" into main 

* changes:
  [Safer intents] Notifications
  [Safer intents] Define package names in Settings
parents 0b61e934 8bc1a141

res/values/config.xml

+19 −4
Original line number Diff line number Diff line
@@ -267,16 +267,31 @@ 
        com.android.settings.intelligence

    </string>



    <!-- Settings intelligence interaction log intent action -->

    <string name="config_settingsintelligence_log_action" translatable="false"></string>



    <!-- Whether Settings intelligence supports presenting Slices. -->

    <bool name="config_settingsintelligence_slice_supported">false</bool>



    <!-- Package Installer package name -->

    <string name="config_package_installer_package_name" translatable="false">

        com.android.packageinstaller

    </string>



    <!-- Settings intelligence interaction log intent action -->

    <string name="config_settingsintelligence_log_action" translatable="false"></string>

    <!-- Device lock controller package name -->

    <string name="config_device_lock_controller_package_name" translatable="false">

        com.android.devicelockcontroller

    </string>



    <!-- Whether Settings intelligence supports presenting Slices. -->

    <bool name="config_settingsintelligence_slice_supported">false</bool>

    <!-- Sound picker package name -->

    <string name="config_sound_picker_package_name" translatable="false">

        com.android.soundpicker

    </string>



    <!-- Contacts package name -->

    <string name="config_contacts_package_name" translatable="false">

        com.android.contacts

    </string>



    <!-- AOSP Emergency app package name -->

    <string name="config_aosp_emergency_package_name" translatable="false">

src/com/android/settings/notification/app/BubbleCategoryPreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class BubbleCategoryPreferenceController extends NotificationPreferenceCo 


        if (mAppRow != null) {

            final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS);

            intent.setPackage(mContext.getPackageName());

            intent.putExtra(Settings.EXTRA_APP_PACKAGE, mAppRow.pkg);

            intent.putExtra(Settings.EXTRA_APP_UID, mAppRow.uid);

            preference.setIntent(intent);

src/com/android/settings/notification/app/BubbleLinkPreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class BubbleLinkPreferenceController extends NotificationPreferenceContro 


        if (mAppRow != null) {

            final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS);

            intent.setPackage(mContext.getPackageName());

            intent.putExtra(Settings.EXTRA_APP_PACKAGE, mAppRow.pkg);

            intent.putExtra(Settings.EXTRA_APP_UID, mAppRow.uid);

            preference.setIntent(intent);

src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ public class BubbleSummaryPreferenceController extends NotificationPreferenceCon 


        if (mAppRow != null) {

            final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS);

            intent.setPackage(mContext.getPackageName());

            intent.putExtra(Settings.EXTRA_APP_PACKAGE, mAppRow.pkg);

            intent.putExtra(Settings.EXTRA_APP_UID, mAppRow.uid);

            preference.setIntent(intent);

src/com/android/settings/notification/history/NotificationHistoryAdapter.java

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import androidx.recyclerview.widget.RecyclerView; 


import com.android.internal.logging.UiEventLogger;

import com.android.settings.R;

import com.android.settings.Utils;



import java.util.ArrayList;

import java.util.List;
@@ -87,6 +88,7 @@ public class NotificationHistoryAdapter extends 
            mUiEventLogger.logWithPosition(NotificationHistoryActivity.NotificationHistoryEvent

                    .NOTIFICATION_HISTORY_OLDER_ITEM_CLICK, hn.getUid(), hn.getPackage(), position);

            Intent intent =  new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)

                    .setPackage(Utils.SETTINGS_PACKAGE_NAME)

                    .putExtra(EXTRA_APP_PACKAGE, hn.getPackage())

                    .putExtra(EXTRA_CHANNEL_ID, hn.getChannelId())

                    .putExtra(EXTRA_CONVERSATION_ID, hn.getConversationId());