| commit | fb2a3233d4d6d5c51017dfcfb4635097743789e0 | [log] [tgz] |
|---|---|---|
| author | Dmitry Dementyev <dementyev@google.com> | Mon Oct 09 18:24:28 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 09 18:24:28 2023 +0000 |
| tree | bfac43ca3d6a877a867a3e1b1f8c934f52c47b30 | |
| parent | 2cd99be820fc7e10754059d065a0a57a400642f9 [diff] | |
| parent | 096a905a9ea7b41cd0b2c5a304ea2bd7b63b45ce [diff] |
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91 am: 096a905a9e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I41a2e74c2365a10eba88984576751ce7c47916f1 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 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; }