Update AccountManagerService checkKeyIntentParceledCorrectly.

Bug: 265798288 Test: manual Change-Id: Ia2030a9dc371dccadd4e188a529351ac4232bb4f
2023-07-05 10:45:04 -07:00
parent 7455a41bd0
commit 8476b140ee
1 changed files with 4 additions and 1 deletions
--- 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) {