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

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

Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into... 

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

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



Change-Id: I715a865c4675cab22276c973c4121074717901dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c43b20f cb1d4123

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

+4 −1
Original line number Diff line number Diff line
@@ -4984,7 +4984,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) {