Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev

2023-07-08 21:55:42 +00:00
parent 345239848c b117b506ec
commit d40861be65
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4839,6 +4839,9 @@ public class AccountManagerService
            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);