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

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

Merge "Stop using deprecated getParcelable method in AccountManagerService."... 

Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a

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



Change-Id: Ibd643c023c52ddbc13dd3be7fe606346dab14ff0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ffeefd07 096a905a

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

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

            Bundle simulateBundle = p.readBundle();

            p.recycle();

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

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

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

                return false;

            }