summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dmitry Dementyev <dementyev@google.com> 2023-10-09 17:17:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-09 17:17:58 +0000
commit096a905a9ea7b41cd0b2c5a304ea2bd7b63b45ce (patch)
tree9cebad7758c5de0f17588cbd96c070815f5eda37
parent70ae1f4e778430ece7dccdd024122244e063cb96 (diff)
parentba2eb5ba91dae6b866c75a4fc3342991f3f784f2 (diff)
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Iee23dba1131908df274359afeca3b18d17a6c8b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/accounts/AccountManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index c30b522f6ac7..8e1e3d86146f 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4984,7 +4984,7 @@ public class AccountManagerService
p.setDataPosition(0);
Bundle simulateBundle = p.readBundle();
p.recycle();
- Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
+ Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT, Intent.class);
if (intent != null && intent.getClass() != Intent.class) {
return false;
}