diff options
| author | 2023-10-09 19:32:24 +0000 | |
|---|---|---|
| committer | 2023-10-09 19:32:24 +0000 | |
| commit | 95bb984fcab1a0c8e9e2657f51c381754c1de23f (patch) | |
| tree | 48f53a572c21a8c71542f2f2e750e5e34cd2ae86 | |
| parent | 04e5d8bf97e783f771cc04e83d1bafe4aa8bc23a (diff) | |
| parent | 47de64a38aa1799cb41f41b2ea0c539ee61de64d (diff) | |
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91 am: 096a905a9e am: 9b0970ed45 am: 47de64a38a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646
Change-Id: I0be6d15109e837d36728adc72f3808b91a81d73b
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.java | 2 |
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; } |