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

Commit d40861be authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Android (Google) Code Review
Browse files

Merge "Update AccountManagerService checkKeyIntentParceledCorrectly." into rvc-dev

parents 34523984 b117b506

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

+3 −0
Original line number Diff line number Diff line
@@ -4839,6 +4839,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);