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

Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev am: d40861be65 am: 8271466531 am: c0cf1e4a4f am: a2473bfbcf

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23883016

Change-Id: I51df39b6623f421e08c6ceab8f5724a505b86070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dmitry Dementyev
2023-07-09 00:49:20 +00:00
committed by Automerger Merge Worker
parent c6952e05d1 a2473bfbcf
commit efd4924e2a
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

@@ -4923,6 +4923,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);