commit 82714665311fa1e01a47ca178c87c0ebc193f440
author Dmitry Dementyev <dementyev@google.com> Sat Jul 08 22:40:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jul 08 22:40:48 2023 +0000
tree 5eb600785b75d7fe52d79ab4a6454a0fdaf43321
parent d013fed99012d45e61aa3ea16c72fa6152c7fe4c
parent d40861be65bc1ae09ba049a840a8eec9543ae5b2

Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65

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

Change-Id: I81e8a60cc87842a971a3cab00b9d46dcd4f0f564
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 545373c..ae72a65 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4840,6 +4840,9 @@
             Bundle simulateBundle = p.readBundle();
             p.recycle();
             Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
+            if (intent != null && intent.getClass() != Intent.class) {
+                return false;
+            }
             Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT);
             if (intent == null) {
                 return (simulateIntent == null);