commit ba2eb5ba91dae6b866c75a4fc3342991f3f784f2
author Dmitry Dementyev <dementyev@google.com> Mon Oct 09 16:41:40 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 09 16:41:40 2023 +0000
tree 1384e62f9486f1682bbb911db0c0caba978e7e5a
parent 31c2eb6356a100ab26ee78d6c66798948eefbf09
parent 916057d17e14e164f1f7db019225dea34121a9d8

Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6d4 am: 916057d17e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646

Change-Id: Ib9fb3f05eed4f2d2ff52b4696291363e33f22a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/accounts/AccountManagerService.java

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 7a51f51..ba6cfab 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4932,7 +4932,7 @@
             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;
             }