mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-15 02:44:23 -05:00
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
|
From 09df73fbe58059be8428b1325c0444a25cd3748b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Adam Bookatz <bookatz@google.com>
|
||
|
|
Date: Mon, 22 Jul 2024 17:03:12 -0700
|
||
|
|
Subject: [PATCH] startActivityForResult with new Intent
|
||
|
|
|
||
|
|
Rather than use the raw Intent, we make a copy of it. See bug.
|
||
|
|
|
||
|
|
Bug: 330722900
|
||
|
|
Flag: EXEMPT bugfix
|
||
|
|
Test: manual
|
||
|
|
Test: atest com.android.settings.users.UserSettingsTest
|
||
|
|
com.android.settings.users.UserDetailsSettingsTest
|
||
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1189e24e47571eae86634aeaa7dc60b8fe7f4820)
|
||
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fdb148b6efb16af018a39511001b48286f401512)
|
||
|
|
Merged-In: Id74e4b7ae261f2916eedaef04a679f83409a4b67
|
||
|
|
Change-Id: Id74e4b7ae261f2916eedaef04a679f83409a4b67
|
||
|
|
---
|
||
|
|
src/com/android/settings/users/AppRestrictionsFragment.java | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
|
||
|
|
index bf0f3da8d00..201d23ceab3 100644
|
||
|
|
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
|
||
|
|
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
|
||
|
|
@@ -648,7 +648,7 @@ public void onReceive(Context context, Intent intent) {
|
||
|
|
int requestCode = generateCustomActivityRequestCode(
|
||
|
|
RestrictionsResultReceiver.this.preference);
|
||
|
|
AppRestrictionsFragment.this.startActivityForResult(
|
||
|
|
- restrictionsIntent, requestCode);
|
||
|
|
+ new Intent(restrictionsIntent), requestCode);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|