Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev

Browse Source
This commit is contained in:
Dmitry Dementyev
2023-07-08 21:55:42 +00:00
committed by Android (Google) Code Review
parent 345239848c b117b506ec
commit d40861be65
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -4839,6 +4839,9 @@ public class AccountManagerService
Bundle simulateBundle = p.readBundle(); Bundle simulateBundle = p.readBundle();
p.recycle(); p.recycle();
Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT); Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
if (intent != null && intent.getClass() != Intent.class) {
return false;
}
Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT); Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT);
if (intent == null) { if (intent == null) {
return (simulateIntent == null); return (simulateIntent == null);