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

Commit a2473bfb 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 rvc-dev am: d40861be am: 82714665 am: c0cf1e4a

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



Change-Id: I9504969069c4af457fad151d087d177e5bea14aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77cbfcd9 c0cf1e4a

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

+3 −0
Original line number Diff line number Diff line
@@ -4923,6 +4923,9 @@ public class AccountManagerService 
            Bundle simulateBundle = p.readBundle();

            p.recycle();

            Intent intent = bundle.getParcelable(AccountManager.KEY_INTENT);

            if (intent != null && intent.getClass() != Intent.class) {

                return false;

            }

            Intent simulateIntent = simulateBundle.getParcelable(AccountManager.KEY_INTENT);

            if (intent == null) {

                return (simulateIntent == null);