summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dmitry Dementyev <dementyev@google.com> 2023-10-09 16:26:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-09 16:26:22 +0000
commita8f86248794809646b7799b9792a3e60f44428c0 (patch)
treedb8f6fbbe81e6b3bb3ebee7f079398ff69d2ff2c
parent9ab9f1c42590ab312da4254d6d9fc6663b19498d (diff)
parent019015b6d4ca643ab826673bff3d307da0464db9 (diff)
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I564fb4a412b410a8ddea41d7e66ac1ad78036b4b 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 7a19d034c2c8..5238595fe2a2 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4923,7 +4923,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;
}