diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-10 18:55:48 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-10 18:55:48 +0000 |
| commit | bb8f16e040a180fea685c43c8a6f06e5f693147d (patch) | |
| tree | d9e731a91dda9b94309d0e757e2eaf6c337acae1 | |
| parent | d31bc017047db2c1f2edec3cac4f07c5db6b4dd3 (diff) | |
| parent | 3a2cda5326c2c73586911bbf6b95a16c7e2ee230 (diff) | |
| download | Settings-bb8f16e040a180fea685c43c8a6f06e5f693147d.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21804233', 'googleplex-android-review.googlesource.com/21804480'] into sc-v2-platform-release.android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android12L-platform-release
Change-Id: Ifca4397c29fd9540f0078d898dacd15f56aeaeb3
| -rw-r--r-- | src/com/android/car/settings/accounts/AccountDetailsPreferenceController.java | 2 | ||||
| -rw-r--r-- | src/com/android/car/settings/accounts/AddAccountActivity.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/car/settings/accounts/AccountDetailsPreferenceController.java b/src/com/android/car/settings/accounts/AccountDetailsPreferenceController.java index 1685b7d66..f07c94712 100644 --- a/src/com/android/car/settings/accounts/AccountDetailsPreferenceController.java +++ b/src/com/android/car/settings/accounts/AccountDetailsPreferenceController.java @@ -68,7 +68,7 @@ public class AccountDetailsPreferenceController extends AccountDetailsBasePrefer Intent removeIntent = result.getParcelable(AccountManager.KEY_INTENT); if (removeIntent != null) { done = false; - getFragmentController().startActivityForResult(removeIntent, + getFragmentController().startActivityForResult(new Intent(removeIntent), REMOVE_ACCOUNT_REQUEST, this); } else { success = future.getResult().getBoolean(AccountManager.KEY_BOOLEAN_RESULT); diff --git a/src/com/android/car/settings/accounts/AddAccountActivity.java b/src/com/android/car/settings/accounts/AddAccountActivity.java index f166887cd..f497b31a9 100644 --- a/src/com/android/car/settings/accounts/AddAccountActivity.java +++ b/src/com/android/car/settings/accounts/AddAccountActivity.java @@ -95,7 +95,7 @@ public class AddAccountActivity extends Activity { intent.putExtras(addAccountOptions); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivityForResultAsUser( - intent, ADD_ACCOUNT_REQUEST, mUserHandle); + new Intent(intent), ADD_ACCOUNT_REQUEST, mUserHandle); } else { setResult(RESULT_OK); if (mPendingIntent != null) { |