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

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

Merge "Add more checkKeyIntent checks to AccountManagerService." into sc-dev... 

Merge "Add more checkKeyIntent checks to AccountManagerService." into sc-dev am: 649ff85e am: b614ab29 am: 30ed0c55 am: 748b1dc9 am: f0720316 am: 6ed37ed6 am: d4e6d819

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



Change-Id: I1d22c3c81e8a6aa2ed6fa381e56504ffce7f9deb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 402b5798 d4e6d819

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

+10 −0
Original line number Diff line number Diff line
@@ -3625,6 +3625,11 @@ public class AccountManagerService 


            // Strip auth token from result.

            result.remove(AccountManager.KEY_AUTHTOKEN);

            if (!checkKeyIntent(Binder.getCallingUid(), result)) {

                onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,

                        "invalid intent in bundle returned");

                return;

            }



            if (Log.isLoggable(TAG, Log.VERBOSE)) {

                Log.v(TAG,
@@ -5214,6 +5219,11 @@ public class AccountManagerService 
                    } else {

                        if (mStripAuthTokenFromResult) {

                            result.remove(AccountManager.KEY_AUTHTOKEN);

                            if (!checkKeyIntent(Binder.getCallingUid(), result)) {

                                onError(AccountManager.ERROR_CODE_INVALID_RESPONSE,

                                        "invalid intent in bundle returned");

                                return;

                            }

                        }

                        if (Log.isLoggable(TAG, Log.VERBOSE)) {

                            Log.v(TAG, getClass().getSimpleName()