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

Commit b9a239be authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "apr12" into rvc-dev 

* changes:
  Collect NeededUriGrants without holding locks.
  Initial splitting of calculation and grants.
parents aa5f48cf 307ea7a2

services/core/java/com/android/server/MmsServiceBroker.java

+10 −6
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ import android.telephony.TelephonyManager; 
import android.util.Slog;

import android.util.Slog;





import com.android.internal.telephony.IMms;

import com.android.internal.telephony.IMms;

import com.android.server.uri.NeededUriGrants;

import com.android.server.uri.UriGrantsManagerInternal;

import com.android.server.uri.UriGrantsManagerInternal;





import java.util.List;

import java.util.List;
@@ -512,9 +513,11 @@ public class MmsServiceBroker extends SystemService { 




            long token = Binder.clearCallingIdentity();

            long token = Binder.clearCallingIdentity();

            try {

            try {

                LocalServices.getService(UriGrantsManagerInternal.class)

                final UriGrantsManagerInternal ugm = LocalServices

                        .grantUriPermissionFromIntent(callingUid, PHONE_PACKAGE_NAME,

                        .getService(UriGrantsManagerInternal.class);

                                grantIntent, UserHandle.USER_SYSTEM);

                final NeededUriGrants needed = ugm.checkGrantUriPermissionFromIntent(

                        grantIntent, callingUid, PHONE_PACKAGE_NAME, UserHandle.USER_SYSTEM);

                ugm.grantUriPermissionUncheckedFromIntent(needed, null);





                // Grant permission for the carrier app.

                // Grant permission for the carrier app.

                Intent intent = new Intent(action);

                Intent intent = new Intent(action);
@@ -524,9 +527,10 @@ public class MmsServiceBroker extends SystemService { 
                        .getCarrierPackageNamesForIntentAndPhone(

                        .getCarrierPackageNamesForIntentAndPhone(

                                intent, getPhoneIdFromSubId(subId));

                                intent, getPhoneIdFromSubId(subId));

                if (carrierPackages != null && carrierPackages.size() == 1) {

                if (carrierPackages != null && carrierPackages.size() == 1) {

                    LocalServices.getService(UriGrantsManagerInternal.class)

                    final NeededUriGrants carrierNeeded = ugm.checkGrantUriPermissionFromIntent(

                            .grantUriPermissionFromIntent(callingUid, carrierPackages.get(0),

                            grantIntent, callingUid, carrierPackages.get(0),

                                    grantIntent, UserHandle.USER_SYSTEM);

                            UserHandle.USER_SYSTEM);

                    ugm.grantUriPermissionUncheckedFromIntent(carrierNeeded, null);

                }

                }

            } finally {

            } finally {

                Binder.restoreCallingIdentity(token);

                Binder.restoreCallingIdentity(token);

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -590,7 +590,7 @@ public final class ActiveServices { 
        }

        }





        NeededUriGrants neededGrants = mAm.mUgmInternal.checkGrantUriPermissionFromIntent(

        NeededUriGrants neededGrants = mAm.mUgmInternal.checkGrantUriPermissionFromIntent(

                callingUid, r.packageName, service, service.getFlags(), null, r.userId);

                service, callingUid, r.packageName, r.userId);





        // If permissions need a review before any of the app components can run,

        // If permissions need a review before any of the app components can run,

        // we do not start the service and launch a review activity if the calling app

        // we do not start the service and launch a review activity if the calling app

services/core/java/com/android/server/am/ActivityManagerService.java

+8 −5
Original line number Original line Diff line number Diff line
@@ -365,6 +365,7 @@ import com.android.server.job.JobSchedulerInternal; 
import com.android.server.pm.Installer;

import com.android.server.pm.Installer;

import com.android.server.pm.permission.PermissionManagerServiceInternal;

import com.android.server.pm.permission.PermissionManagerServiceInternal;

import com.android.server.uri.GrantUri;

import com.android.server.uri.GrantUri;

import com.android.server.uri.NeededUriGrants;

import com.android.server.uri.UriGrantsManagerInternal;

import com.android.server.uri.UriGrantsManagerInternal;

import com.android.server.utils.PriorityDump;

import com.android.server.utils.PriorityDump;

import com.android.server.utils.TimingsTraceAndSlog;

import com.android.server.utils.TimingsTraceAndSlog;
@@ -6511,17 +6512,19 @@ public class ActivityManagerService extends IActivityManager.Stub 
            if (targetPkg == null) {

            if (targetPkg == null) {

                throw new IllegalArgumentException("null target");

                throw new IllegalArgumentException("null target");

            }

            }

            if (grantUri == null) {

                throw new IllegalArgumentException("null uri");

            }

















            Preconditions.checkFlagsArgument(modeFlags, Intent.FLAG_GRANT_READ_URI_PERMISSION







            Preconditions.checkFlagsArgument(modeFlags, Intent.FLAG_GRANT_READ_URI_PERMISSION











                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION







                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION











                    | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION







                    | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION











                    | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);







                    | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);



























            mUgmInternal.grantUriPermission(r.uid, targetPkg, grantUri, modeFlags, null,







            final Intent intent = new Intent();











                    UserHandle.getUserId(r.uid));







            intent.setData(uri);














            intent.setFlags(modeFlags);



























            final NeededUriGrants needed = mUgmInternal.checkGrantUriPermissionFromIntent(intent,














                    r.uid, targetPkg, UserHandle.getUserId(r.uid));














            mUgmInternal.grantUriPermissionUncheckedFromIntent(needed, null);











        }







        }











    }







    }

















































services/core/java/com/android/server/uri/UriGrantsManagerInternal.java



+19
−12




























Original line number
Original line
Diff line number
Diff line








@@ -31,28 +31,35 @@ import java.io.PrintWriter;









public interface UriGrantsManagerInternal {







public interface UriGrantsManagerInternal {











    void onSystemReady();







    void onSystemReady();











    void removeUriPermissionIfNeeded(UriPermission perm);







    void removeUriPermissionIfNeeded(UriPermission perm);











    void grantUriPermission(int callingUid, String targetPkg, GrantUri grantUri,



















            final int modeFlags, UriPermissionOwner owner, int targetUserId);














    void revokeUriPermission(String targetPackage, int callingUid,







    void revokeUriPermission(String targetPackage, int callingUid,











            GrantUri grantUri, final int modeFlags);







            GrantUri grantUri, final int modeFlags);


























    boolean checkUriPermission(GrantUri grantUri, int uid, final int modeFlags);







    boolean checkUriPermission(GrantUri grantUri, int uid, final int modeFlags);











    int checkGrantUriPermission(int callingUid, String targetPkg, GrantUri grantUri,














            final int modeFlags, int lastTargetUid);














    int checkGrantUriPermission(







    int checkGrantUriPermission(











            int callingUid, String targetPkg, Uri uri, int modeFlags, int userId);







            int callingUid, String targetPkg, Uri uri, int modeFlags, int userId);











    NeededUriGrants checkGrantUriPermissionFromIntent(int callingUid,



















            String targetPkg, Intent intent, int mode, NeededUriGrants needed, int targetUserId);














    /**







    /**











     * Grant Uri permissions from one app to another. This method only extends







     * Calculate the set of permission grants that would be needed to extend











     * permission grants if {@code callingUid} has permission to them.







     * access for the given {@link Intent} to the given target package.














     *














     * @throws SecurityException if the caller doesn't have permission to the














     *             {@link Intent} data, or if the underlying provider doesn't














     *             allow permissions to be granted.














     */














    NeededUriGrants checkGrantUriPermissionFromIntent(Intent intent, int callingUid,














            String targetPkg, int targetUserId);





























    /**














     * Extend a previously calculated set of permissions grants to the given














     * owner. All security checks will have already been performed as part of














     * calculating {@link NeededUriGrants}.











     */







     */











    void grantUriPermissionFromIntent(int callingUid,














            String targetPkg, Intent intent, int targetUserId);














    void grantUriPermissionFromIntent(int callingUid,














            String targetPkg, Intent intent, UriPermissionOwner owner, int targetUserId);














    void grantUriPermissionUncheckedFromIntent(







    void grantUriPermissionUncheckedFromIntent(











            NeededUriGrants needed, UriPermissionOwner owner);







            NeededUriGrants needed, UriPermissionOwner owner);


























    IBinder newUriPermissionOwner(String name);







    IBinder newUriPermissionOwner(String name);


























    /**







    /**











     * Remove any {@link UriPermission} granted <em>from</em> or <em>to</em> the







     * Remove any {@link UriPermission} granted <em>from</em> or <em>to</em> the











     * given package.







     * given package.

































services/core/java/com/android/server/uri/UriGrantsManagerService.java



+4
−50




























Original line number
Original line
Diff line number
Diff line








@@ -635,17 +635,6 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub {









        return needed;







        return needed;











    }







    }































    void grantUriPermissionFromIntent(int callingUid,














            String targetPkg, Intent intent, UriPermissionOwner owner, int targetUserId) {














        NeededUriGrants needed = checkGrantUriPermissionFromIntent(callingUid, targetPkg,














                intent, intent != null ? intent.getFlags() : 0, null, targetUserId);














        if (needed == null) {














            return;














        }





























        grantUriPermissionUncheckedFromIntent(needed, owner);














    }





























    void readGrantedUriPermissions() {







    void readGrantedUriPermissions() {











        if (DEBUG) Slog.v(TAG, "readGrantedUriPermissions()");







        if (DEBUG) Slog.v(TAG, "readGrantedUriPermissions()");






























@@ -1325,15 +1314,6 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub {









            }







            }











        }







        }































        @Override














        public void grantUriPermission(int callingUid, String targetPkg, GrantUri grantUri,














                int modeFlags, UriPermissionOwner owner, int targetUserId) {














            synchronized (mLock) {














                UriGrantsManagerService.this.grantUriPermission(














                        callingUid, targetPkg, grantUri, modeFlags, owner, targetUserId);














            }














        }





























        @Override







        @Override











        public void revokeUriPermission(String targetPackage, int callingUid, GrantUri grantUri,







        public void revokeUriPermission(String targetPackage, int callingUid, GrantUri grantUri,











                int modeFlags) {







                int modeFlags) {









@@ -1350,15 +1330,6 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub {









            }







            }











        }







        }































        @Override














        public int checkGrantUriPermission(int callingUid, String targetPkg, GrantUri uri,














                int modeFlags, int userId) {














            synchronized (mLock) {














                return UriGrantsManagerService.this.checkGrantUriPermission(














                        callingUid, targetPkg, uri, modeFlags, userId);














            }














        }





























        @Override







        @Override











        public int checkGrantUriPermission(int callingUid, String targetPkg, Uri uri, int modeFlags,







        public int checkGrantUriPermission(int callingUid, String targetPkg, Uri uri, int modeFlags,











                int userId) {







                int userId) {









@@ -1370,29 +1341,12 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub {









        }







        }































        @Override







        @Override











        public NeededUriGrants checkGrantUriPermissionFromIntent(int callingUid, String targetPkg,







        public NeededUriGrants checkGrantUriPermissionFromIntent(Intent intent, int callingUid,











                Intent intent, int mode, NeededUriGrants needed, int targetUserId) {







                String targetPkg, int targetUserId) {











            synchronized (mLock) {







            synchronized (mLock) {














                final int mode = (intent != null) ? intent.getFlags() : 0;











                return UriGrantsManagerService.this.checkGrantUriPermissionFromIntent(







                return UriGrantsManagerService.this.checkGrantUriPermissionFromIntent(











                        callingUid, targetPkg, intent, mode, needed, targetUserId);







                        callingUid, targetPkg, intent, mode, null, targetUserId);











            }














        }





























        @Override














        public void grantUriPermissionFromIntent(int callingUid, String targetPkg, Intent intent,














                int targetUserId) {














            synchronized (mLock) {














                UriGrantsManagerService.this.grantUriPermissionFromIntent(














                        callingUid, targetPkg, intent, null, targetUserId);














            }














        }





























        @Override














        public void grantUriPermissionFromIntent(int callingUid, String targetPkg, Intent intent,














                UriPermissionOwner owner, int targetUserId) {














            synchronized (mLock) {














                UriGrantsManagerService.this.grantUriPermissionFromIntent(














                        callingUid, targetPkg, intent, owner, targetUserId);














            }







            }











        }







        }