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

Commit 9d370604 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev

parents f32424b9 a20eb2a4

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -4184,6 +4184,10 @@ public class AccountManagerService 
        protected void checkKeyIntent(

        protected void checkKeyIntent(

                int authUid,

                int authUid,

                Intent intent) throws SecurityException {

                Intent intent) throws SecurityException {

            intent.setFlags(intent.getFlags() & ~(Intent.FLAG_GRANT_READ_URI_PERMISSION

                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION

                    | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION

                    | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION));

            long bid = Binder.clearCallingIdentity();

            long bid = Binder.clearCallingIdentity();

            try {

            try {

                PackageManager pm = mContext.getPackageManager();

                PackageManager pm = mContext.getPackageManager();