summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dmitry Dementyev <dementyev@google.com> 2023-10-09 18:56:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-09 18:56:33 +0000
commit47de64a38aa1799cb41f41b2ea0c539ee61de64d (patch)
treef934d7e0f78dfb01133bf1f742175768bc509796
parentaeccbc583be90164d867be34352e28badf7dc0fd (diff)
parent9b0970ed459791138211b48e2cc86983dd3f242c (diff)
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91 am: 096a905a9e am: 9b0970ed45
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: If51f47e2d172c1df47a546d7014539d816b480bf 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 5fec8494fb92..955ff29e485b 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4996,7 +4996,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;
}