Skip to content

Commit f810d81

Browse files
Dmitry Dementyevdoryiii
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 109e58b commit f810d81

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
@@ -4923,7 +4923,10 @@ private boolean checkKeyIntentParceledCorrectly(Bundle bundle) {
49234923
p.setDataPosition(0);
49244924
Bundle simulateBundle = p.readBundle();
49254925
p.recycle();
4926-
Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT, Intent.class);
4926+
Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);
4927+
if (intent != null && intent.getClass() != Intent.class) {
4928+
return false;
4929+
}
49274930
Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT,
49284931
Intent.class);
49294932
if (intent == null) {

0 commit comments

Comments
 (0)