Skip to content

Commit 6801e48

Browse files
Dmitry DementyevAndroid Build Coastguard Worker
authored andcommitted
Update AccountManagerService checkKeyIntentParceledCorrectly.
Bug: 265798288 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8476b140eed0235df4e8f07d94420a1471191b55) Merged-In: Ia2030a9dc371dccadd4e188a529351ac4232bb4f Change-Id: Ia2030a9dc371dccadd4e188a529351ac4232bb4f
1 parent c39303e commit 6801e48

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

services/core/java/com/android/server/accounts/AccountManagerService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4932,7 +4932,10 @@ private boolean checkKeyIntentParceledCorrectly(Bundle bundle) {
49324932
p.setDataPosition(0);
49334933
Bundle simulateBundle = p.readBundle();
49344934
p.recycle();
4935-
Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT, Intent.class);
4935+
Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
4936+
if (intent != null && intent.getClass() != Intent.class) {
4937+
return false;
4938+
}
49364939
Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT,
49374940
Intent.class);
49384941
if (intent == null) {

0 commit comments

Comments
 (0)