diff options
| author | 2023-07-08 02:22:48 +0000 | |
|---|---|---|
| committer | 2023-07-08 02:22:48 +0000 | |
| commit | b8a902b69208341d33dcfb36c9c61f7b277b6f04 (patch) | |
| tree | fe60cb92c5683a6a72aa90c4c20834da2cdc265b | |
| parent | 86c65ff4e4c647f646a52fc3bab96ae0dbfa2aba (diff) | |
| parent | 1a3bef4300fa0e003c3885c389652717ebb1b610 (diff) | |
Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into tm-dev am: 1a3bef4300
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23905120
Change-Id: I71e401082d4da83349e31230f7efad769e239de0
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 | 5 |
1 files changed, 4 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 639f35e1ae13..7a19d034c2c8 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -4923,7 +4923,10 @@ public class AccountManagerService p.setDataPosition(0); Bundle simulateBundle = p.readBundle(); p.recycle(); - Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT, Intent.class); + Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT); + if (intent != null && intent.getClass() != Intent.class) { + return false; + } Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT, Intent.class); if (intent == null) { |