mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
59bf3b75c7
https://review.lineageos.org/c/LineageOS/android_frameworks_base/+/353117 https://review.lineageos.org/q/topic:Q_asb_2023-03 https://review.lineageos.org/q/topic:Q_asb_2023-04 https://review.lineageos.org/q/topic:Q_asb_2023-05 https://review.lineageos.org/q/topic:Q_asb_2023-06 https://review.lineageos.org/q/topic:Q_asb_2023-07 https://review.lineageos.org/q/topic:Q_asb_2023-08 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376560 https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376561 https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376562 https://review.lineageos.org/q/topic:Q_asb_2023-09 https://review.lineageos.org/q/topic:Q_asb_2023-10 https://review.lineageos.org/q/topic:Q_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376563 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_webp/+/376568 https://review.lineageos.org/q/topic:Q_asb_2023-12 https://review.lineageos.org/q/topic:Q_asb_2024-01 https://review.lineageos.org/q/topic:Q_asb_2024-02 https://review.lineageos.org/q/topic:Q_asb_2024-03 Signed-off-by: Tavi <tavi@divested.dev>
29 lines
1.5 KiB
Diff
29 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Dementyev <dementyev@google.com>
|
|
Date: Tue, 7 Mar 2023 10:36:41 -0800
|
|
Subject: [PATCH] Convert argument to intent in AddAccountSettings.
|
|
|
|
Bug: 265798353
|
|
Test: manual
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7e8052b527434ed8660e3babdab718f7f3cd7da)
|
|
Merged-In: I0051e5d5fc9fd3691504cb5fbb959f701e0bce6a
|
|
Change-Id: I0051e5d5fc9fd3691504cb5fbb959f701e0bce6a
|
|
---
|
|
src/com/android/settings/accounts/AddAccountSettings.java | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
|
|
index cca15c96d3c..2e23e931241 100644
|
|
--- a/src/com/android/settings/accounts/AddAccountSettings.java
|
|
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
|
|
@@ -102,7 +102,8 @@ public class AddAccountSettings extends Activity {
|
|
addAccountOptions.putParcelable(EXTRA_USER, mUserHandle);
|
|
intent.putExtras(addAccountOptions);
|
|
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
|
- startActivityForResultAsUser(intent, ADD_ACCOUNT_REQUEST, mUserHandle);
|
|
+ startActivityForResultAsUser(
|
|
+ new Intent(intent), ADD_ACCOUNT_REQUEST, mUserHandle);
|
|
} else {
|
|
setResult(RESULT_OK);
|
|
if (mPendingIntent != null) {
|