commit cf13dfd4c69fc5524c6639c5e8c4054f266691a4
author Jason Chiu <chiujason@google.com> Wed Mar 27 12:25:32 2024 +0800
committer Jason Chiu <chiujason@google.com> Thu Mar 28 17:09:37 2024 +0800
tree 24dd072dd77b83908d2c20801dc7e54db63e495f
parent 67bfb4141fbb8b11d78581e767e595ff1cf8968a

[Safer intents] Permission controller

To avoid implicit intents, make intents launch explicitly.

Test: build, manual
Bug: 323061508
Change-Id: Ib95b417fc8682f690890fc55f321b4fece2c0369

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 2f6f04a..00ffc26 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -140,7 +140,8 @@
 
             if (SafetyCenterManagerWrapper.get().isEnabled(this)) {
                 try {
-                    startActivity(new Intent(Intent.ACTION_SAFETY_CENTER));
+                    startActivity(new Intent(Intent.ACTION_SAFETY_CENTER)
+                            .setPackage(getPackageManager().getPermissionControllerPackageName()));
                     finish();
                 } catch (ActivityNotFoundException e) {
                     Log.e(TAG, "Unable to open safety center", e);
@@ -235,7 +236,8 @@
             if (ACTION_PRIVACY_SETTINGS.equals(getIntent().getAction())
                     && SafetyCenterManagerWrapper.get().isEnabled(this)) {
                 try {
-                    startActivity(new Intent(Intent.ACTION_SAFETY_CENTER));
+                    startActivity(new Intent(Intent.ACTION_SAFETY_CENTER)
+                            .setPackage(getPackageManager().getPermissionControllerPackageName()));
                     finish();
                 } catch (ActivityNotFoundException e) {
                     Log.e(TAG, "Unable to open safety center", e);