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

Commit 7952c93b authored by Hao Ke's avatar Hao Ke Committed by Automerger Merge Worker
Browse files

Merge "Fix checkKeyIntentParceledCorrectly's bypass" into rvc-dev am: 82a8fddc 

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



Change-Id: Ia3f19e488ec06ad7bdb853ce26fafea2f59a8bcd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f65a2953 82a8fddc

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

+9 −6
Original line number Diff line number Diff line
@@ -3430,8 +3430,7 @@ public class AccountManagerService 
            Bundle.setDefusable(result, true);

            mNumResults++;

            Intent intent = null;

            if (result != null

                    && (intent = result.getParcelable(AccountManager.KEY_INTENT)) != null) {

            if (result != null) {

                if (!checkKeyIntent(

                        Binder.getCallingUid(),

                        result)) {
@@ -4790,8 +4789,10 @@ public class AccountManagerService 
            	EventLog.writeEvent(0x534e4554, "250588548", authUid, "");

                return false;

            }



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

            if (intent == null) {

                return true;

            }

            // Explicitly set an empty ClipData to ensure that we don't offer to

            // promote any Uris contained inside for granting purposes

            if (intent.getClipData() == null) {
@@ -4844,7 +4845,10 @@ public class AccountManagerService 
            p.recycle();

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

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

            return (intent.filterEquals(simulateIntent));

            if (intent == null) {

                return (simulateIntent == null);

            }

            return intent.filterEquals(simulateIntent);

        }



        private boolean isExportedSystemActivity(ActivityInfo activityInfo) {
@@ -4989,8 +4993,7 @@ public class AccountManagerService 
                    }

                }

            }

            if (result != null

                    && (intent = result.getParcelable(AccountManager.KEY_INTENT)) != null) {

            if (result != null) {

                if (!checkKeyIntent(

                        Binder.getCallingUid(),

                        result)) {