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

Commit e617076f authored by Hai Zhang's avatar Hai Zhang
Browse files

Add FLAG_PERMISSION_GRANTED_BY_ROLE. 

We need a flag to track permissions granted by role, otherwise upon
revocation we might revoke permission that was already granted before
the role is granted.

Bug: 124452117
Bug: 130231314
Bug: 131252995
Test: presubmit
Change-Id: I0abd89756e8dc943c19d18315a8dcc6890f6fd2d
parent 471ddb2b

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -1655,6 +1655,7 @@ package android.content.pm { 
    field public static final String FEATURE_TELEPHONY_CARRIERLOCK = "android.hardware.telephony.carrierlock";

    field public static final int FLAG_PERMISSION_APPLY_RESTRICTION = 16384; // 0x4000

    field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20

    field public static final int FLAG_PERMISSION_GRANTED_BY_ROLE = 32768; // 0x8000

    field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4

    field public static final int FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT = 2048; // 0x800

    field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000
@@ -1728,7 +1729,7 @@ package android.content.pm { 
    method public void onPermissionsChanged(int);

  }













  @IntDef(prefix={"FLAG_PERMISSION_"}, value={android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET, android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE, android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface PackageManager.PermissionFlags {













  @IntDef(prefix={"FLAG_PERMISSION_"}, value={android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET, android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_POLICY_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE, android.content.pm.PackageManager.FLAG_PERMISSION_SYSTEM_FIXED, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_DEFAULT, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED, android.content.pm.PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT, android.content.pm.PackageManager.FLAG_PERMISSION_APPLY_RESTRICTION, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_ROLE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface PackageManager.PermissionFlags {















  }





























  public class PermissionGroupInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

































api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -710,6 +710,7 @@ package android.content.pm {













    field public static final String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage";















    field public static final String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption";















    field public static final int FLAG_PERMISSION_APPLY_RESTRICTION = 16384; // 0x4000













    field public static final int FLAG_PERMISSION_GRANTED_BY_ROLE = 32768; // 0x8000















    field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4















    field public static final int FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT = 2048; // 0x800















    field public static final int FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT = 4096; // 0x1000

































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



+14
−3




























Original line number
Diff line number
Diff line








@@ -3143,6 +3143,14 @@ public abstract class PackageManager {













    @SystemApi















    public static final int FLAG_PERMISSION_APPLY_RESTRICTION =  1 << 14;





























    /**













     * Permission flag: The permission is granted because the application holds a role.













     *













     * @hide













     */













    @SystemApi













    @TestApi













    public static final int FLAG_PERMISSION_GRANTED_BY_ROLE =  1 << 15;































    /**















     * Permission flags: Bitwise or of all permission flags allowing an










@@ -3183,7 +3191,8 @@ public abstract class PackageManager {













            | FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT















            | FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT















            | FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT













            | FLAG_PERMISSION_APPLY_RESTRICTION;













            | FLAG_PERMISSION_APPLY_RESTRICTION













            | FLAG_PERMISSION_GRANTED_BY_ROLE;































    /**















     * Injected activity in app that forwards user to setting activity of that app.










@@ -3947,7 +3956,8 @@ public abstract class PackageManager {













            FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT,















            FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT,















            FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT,













            FLAG_PERMISSION_APPLY_RESTRICTION













            FLAG_PERMISSION_APPLY_RESTRICTION,













            FLAG_PERMISSION_GRANTED_BY_ROLE















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface PermissionFlags {}










@@ -7030,7 +7040,8 @@ public abstract class PackageManager {













            case FLAG_PERMISSION_RESTRICTION_INSTALLER_EXEMPT: return "RESTRICTION_INSTALLER_EXEMPT";















            case FLAG_PERMISSION_RESTRICTION_SYSTEM_EXEMPT: return "RESTRICTION_SYSTEM_EXEMPT";















            case FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT: return "RESTRICTION_UPGRADE_EXEMPT";













            case FLAG_PERMISSION_APPLY_RESTRICTION: return "FLAG_PERMISSION_APPLY_RESTRICTION";













            case FLAG_PERMISSION_APPLY_RESTRICTION: return "APPLY_RESTRICTION";













            case FLAG_PERMISSION_GRANTED_BY_ROLE: return "GRANTED_BY_ROLE";















            default: return Integer.toString(flag);















        }















    }