| commit | a4493d824c2c9267c2a5f5968f5eabd3f718e6f5 | [log] [tgz] |
|---|---|---|
| author | Dmitry Dementyev <dementyev@google.com> | Mon Oct 09 18:58:27 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 09 18:58:27 2023 +0000 |
| tree | 8d27652052ca0fe1ea770a08141321676956453f | |
| parent | 5ddb38b6b120733d19e9511098388347904dc3a2 [diff] | |
| parent | fb2a3233d4d6d5c51017dfcfb4635097743789e0 [diff] |
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91 am: 096a905a9e am: fb2a3233d4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I382e64d4fd1041444562802721e0ed55ab8e3495 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 330742a..5fb889a 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -5023,7 +5023,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; }