PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Safer intents] Permission controller" into main

Browse Source
This commit is contained in:
Jason Chiu
2024-03-29 09:20:28 +00:00
committed by Android (Google) Code Review
parent cac043d82e cf13dfd4c6
commit 6ca5c992d7
22 changed files with 182 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/Settings.java
View File

@@ -140,7 +140,8 @@ public class Settings extends SettingsActivity {
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 @@ public class Settings extends SettingsActivity {
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);