Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "startActivityForResult with earlier new Intent" into security-aosp-25Q2-staging

Browse Source
This commit is contained in:
Treehugger Robot
2025-06-20 11:52:40 -07:00
committed by Android (Google) Code Review
parent 145b4a0870 d8166274a0
commit ea8022feeb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/users/AppRestrictionsFragment.java
View File

@@ -665,8 +665,9 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
*/ */
private Intent assertSafeToStartCustomActivity(Intent intent) { private Intent assertSafeToStartCustomActivity(Intent intent) {
EventLog.writeEvent(0x534e4554, "223578534", -1 /* UID */, ""); EventLog.writeEvent(0x534e4554, "223578534", -1 /* UID */, "");
final Intent vettedIntent = new Intent(intent);
ResolveInfo resolveInfo = mPackageManager.resolveActivity( ResolveInfo resolveInfo = mPackageManager.resolveActivity(
intent, PackageManager.MATCH_DEFAULT_ONLY); vettedIntent, PackageManager.MATCH_DEFAULT_ONLY);
if (resolveInfo == null) { if (resolveInfo == null) {
throw new ActivityNotFoundException("No result for resolving " + intent); throw new ActivityNotFoundException("No result for resolving " + intent);
@@ -680,7 +681,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
// We were able to vet the given intent this time. Make a copy using the components // We were able to vet the given intent this time. Make a copy using the components
// that were used to do the vetting, since that's as much as we've verified is safe. // that were used to do the vetting, since that's as much as we've verified is safe.
final Intent vettedIntent = new Intent(intent);
vettedIntent.setComponent(activityInfo.getComponentName()); vettedIntent.setComponent(activityInfo.getComponentName());
vettedIntent.setPackage(activityInfo.packageName); vettedIntent.setPackage(activityInfo.packageName);
return vettedIntent; return vettedIntent;