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

Commit 171fe6ac authored by Svet Ganov's avatar Svet Ganov Committed by Android (Google) Code Review
Browse files

Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev

parents 4ee9b23a ad3b2975

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -9256,6 +9256,7 @@ package android.content.pm { 
    method public abstract java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle);

    method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);

    method public abstract boolean hasSystemFeature(java.lang.String);

    method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);

    method public abstract boolean isSafeMode();

    method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);

    method public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int);
@@ -31806,6 +31807,7 @@ package android.test.mock { 
    method public java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle);

    method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);

    method public boolean hasSystemFeature(java.lang.String);

    method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);

    method public boolean isSafeMode();

    method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);

    method public java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -9540,6 +9540,7 @@ package android.content.pm { 
    method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);

    method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);

    method public abstract boolean hasSystemFeature(java.lang.String);

    method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);

    method public abstract boolean isSafeMode();

    method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);

    method public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int);
@@ -34092,6 +34093,7 @@ package android.test.mock { 
    method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);

    method public void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);

    method public boolean hasSystemFeature(java.lang.String);

    method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);

    method public boolean isSafeMode();

    method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);

    method public java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int);

core/java/android/app/ApplicationPackageManager.java

+9 −0
Original line number Diff line number Diff line
@@ -420,6 +420,15 @@ final class ApplicationPackageManager extends PackageManager { 
        }

    }



    @Override

    public boolean isPermissionRevokedByPolicy(String permName, String pkgName) {

        try {

            return mPM.isPermissionRevokedByPolicy(permName, pkgName, mContext.getUserId());

        } catch (RemoteException e) {

            throw new RuntimeException("Package manager has died", e);

        }

    }



    @Override

    public boolean addPermission(PermissionInfo info) {

        try {

core/java/android/content/pm/IPackageManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -506,4 +506,6 @@ interface IPackageManager { 
    int getMountExternalMode(int uid);



    void grantDefaultPermissionsToEnabledCarrierApps(in String[] packageNames, int userId);



    boolean isPermissionRevokedByPolicy(String permission, String packageName, int userId);

}

core/java/android/content/pm/PackageManager.java

+16 −1
Original line number Diff line number Diff line
@@ -2398,7 +2398,7 @@ public abstract class PackageManager { 
     * Check whether a particular package has been granted a particular

     * permission.

     *

     * @param permName The name of the permission you are checking for,

     * @param permName The name of the permission you are checking for.

     * @param pkgName The name of the package you are checking against.

     *

     * @return If the package has the permission, PERMISSION_GRANTED is
@@ -2411,6 +2411,21 @@ public abstract class PackageManager { 
    @CheckResult

    public abstract int checkPermission(String permName, String pkgName);



    /**

     * Checks whether a particular permissions has been revoked for a

     * package by policy. Typically the device owner or the profile owner

     * may apply such a policy. The user cannot grant policy revoked

     * permissions, hence the only way for an app to get such a permission

     * is by a policy change.

     *

     * @param permName The name of the permission you are checking for.

     * @param pkgName The name of the package you are checking against.

     *

     * @return Whether the permission is restricted by policy.

     */

    @CheckResult

    public abstract boolean isPermissionRevokedByPolicy(String permName, String pkgName);



    /**

     * Add a new dynamic permission to the system.  For this to work, your

     * package must have defined a permission tree through the