commit 2de493e29b528c336b85d1e825374f3dae065d2d
author Dmitry Dementyev <dementyev@google.com> Mon Oct 09 17:18:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 09 17:18:36 2023 +0000
tree 9cebad7758c5de0f17588cbd96c070815f5eda37
parent 70ae1f4e778430ece7dccdd024122244e063cb96
parent a8f86248794809646b7799b9792a3e60f44428c0

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

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

Change-Id: Id59b189e04c312f3305b0aec0bb9e1843a742839
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 c30b522..8e1e3d8 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 @@
             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;
             }