commit b117b506ec0504ff9eb2fa523e82f1879ecb8cc1
author Dmitry Dementyev <dementyev@google.com> Fri Jun 30 14:36:44 2023 -0700
committer Dmitry Dementyev <dementyev@google.com> Wed Jul 05 10:46:00 2023 -0700
tree 7ec7c0db6148168e53b25517a9a607fb63aa7aab
parent 7e6c75ccb560fe18dcc756ea727e5188dd33eab9

Update AccountManagerService checkKeyIntentParceledCorrectly.

Bug: 265798288
Test: manual
Change-Id: Iad33851af32a11c99d11bc2b5c76d124c3e97ebb
Merged-In: Ia2030a9dc371dccadd4e188a529351ac4232bb4f

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 ef86702..584031c 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4839,6 +4839,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);