commit d40861be65bc1ae09ba049a840a8eec9543ae5b2
author Dmitry Dementyev <dementyev@google.com> Sat Jul 08 21:55:42 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 08 21:55:42 2023 +0000
tree 04e3623e4e8f3739d9afc1a6c62bba6ae65b7ebb
parent 345239848c65bf488135700774533abd8a855021
parent b117b506ec0504ff9eb2fa523e82f1879ecb8cc1

Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev

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);