Merge "[Safer intents] Permission controller" into main

2024-03-29 09:20:28 +00:00
parent cac043d82e cf13dfd4c6
commit 6ca5c992d7
22 changed files with 182 additions and 49 deletions
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -921,7 +921,9 @@ public class ManageApplications extends InstrumentedFragment
                        .setResultListener(this, ADVANCED_SETTINGS)
                        .launch();
            } else {
-                Intent intent = new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS);
+                Intent intent = new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
+                        .setPackage(getContext()
+                                .getPackageManager().getPermissionControllerPackageName());
                startActivityForResult(intent, ADVANCED_SETTINGS);
            }
            return true;