diff options
| author | Adam Bookatz <bookatz@google.com> | 2024-12-11 17:22:46 -0800 |
|---|---|---|
| committer | aoleary <seanm187@gmail.com> | 2025-10-07 19:02:15 +0000 |
| commit | 9bcfbc15f34e7cd288e277a24fb770df1108d8c0 (patch) | |
| tree | 899a730e443dbd6b943c9a6d245ac010b57b1d16 | |
| parent | 684c9c5449a760331b38029027380ecd280d3aeb (diff) | |
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
(cherry picked from commit b7240e2f0c50455a1c8f3ae1fc4f27d55b86e89b)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f86a8b75b191c7025599ea6911abf3aa36bb2056)
Merged-In: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179
Change-Id: I860e9e606de6b8d3c99fa52a63b72ba7a99ce179
| -rw-r--r-- | src/com/android/settings/users/AppRestrictionsFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index 379e4bbaec6..60b7925967d 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -669,8 +669,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); @@ -684,7 +685,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; |