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

Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into tm-dev am: 1a3bef4300 am: f98235751f

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

Change-Id: I36197df761758008cc9c7e22d9dcc59aae4cec93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dmitry Dementyev
2023-07-08 03:05:23 +00:00
committed by Automerger Merge Worker
parent 69a91c3545 f98235751f
commit 8d17391997
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4932,7 +4932,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) {