From dc6546f6d56183bc2a911812dff03d4259510130 Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Wed, 11 Dec 2024 17:22:46 -0800 Subject: [SP 2025-09-01] startActivityForResult with earlier new Intent We already make sure to use a copy of the Intent, but now we do so earlier. See bug. Bug: 353680402 Flag: EXEMPT bugfix Test: manual Test: atest com.android.settings.users.UserSettingsTest com.android.settings.users.UserDetailsSettingsTest Change-Id: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179 Merged-In: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179 (cherry picked from commit b7240e2f0c50455a1c8f3ae1fc4f27d55b86e89b) --- src/com/android/settings/users/AppRestrictionsFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index c4a01797d0e..5b2a86fff42 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -665,8 +665,9 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen */ private Intent assertSafeToStartCustomActivity(Intent intent) { EventLog.writeEvent(0x534e4554, "223578534", -1 /* UID */, ""); + final Intent vettedIntent = new Intent(intent); ResolveInfo resolveInfo = mPackageManager.resolveActivity( - intent, PackageManager.MATCH_DEFAULT_ONLY); + vettedIntent, PackageManager.MATCH_DEFAULT_ONLY); if (resolveInfo == null) { 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 // 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.setPackage(activityInfo.packageName); return vettedIntent; -- cgit v1.2.3-59-g8ed1b