Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8a902b6 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I71e401082d4da83349e31230f7efad769e239de0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86c65ff4 1a3bef43

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -4923,7 +4923,10 @@ public class AccountManagerService 
            p.setDataPosition(0);

            p.setDataPosition(0);

            Bundle simulateBundle = p.readBundle();

            Bundle simulateBundle = p.readBundle();

            p.recycle();

            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 simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT,

                    Intent.class);

                    Intent.class);

            if (intent == null) {

            if (intent == null) {