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

Commit 1d181924 authored by Eugene Susla's avatar Eugene Susla
Browse files

Add marker flag for permissions revoked by auto-revoke 

UX wants special UI to explain permissions revoked because of auto-revoke,
so we need a way to mark them.

Bug: 146513245
Test: presubmit
Change-Id: Idb753c5036ffe94995773756f329ea26d7c40b64
parent 9ed37d13

api/system-current.txt

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

    field public static final int FLAGS_PERMISSION_RESERVED_PERMISSIONCONTROLLER = -268435456; // 0xf0000000

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

    field public static final int FLAG_PERMISSION_AUTO_REVOKED = 1048576; // 0x100000

    field public static final int FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED = 131072; // 0x20000

    field public static final int FLAG_PERMISSION_AUTO_REVOKE_USER_SET = 262144; // 0x40000

    field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20
@@ -2302,7 +2303,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, android.content.pm.PackageManager.FLAG_PERMISSION_GRANTED_BY_ROLE, android.content.pm.PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, android.content.pm.PackageManager.FLAG_PERMISSION_ONE_TIME, android.content.pm.PackageManager.FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED, android.content.pm.PackageManager.FLAG_PERMISSION_AUTO_REVOKE_USER_SET}) @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, android.content.pm.PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, android.content.pm.PackageManager.FLAG_PERMISSION_ONE_TIME, android.content.pm.PackageManager.FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED, android.content.pm.PackageManager.FLAG_PERMISSION_AUTO_REVOKE_USER_SET, android.content.pm.PackageManager.FLAG_PERMISSION_AUTO_REVOKED}) @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 {

































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



+13
−2




























Original line number
Diff line number
Diff line








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













    @SystemApi















    public static final int FLAG_PERMISSION_AUTO_REVOKE_USER_SET = 1 << 18;





























    /**













     * Permission flag: Whether permission was revoked by auto-revoke.













     *













     * @hide













     */













    @SystemApi













    public static final int FLAG_PERMISSION_AUTO_REVOKED = 1 << 20;





























    /**















     * Permission flags: Reserved for use by the permission controller.















     *










@@ -3437,7 +3445,8 @@ public abstract class PackageManager {













            | FLAG_PERMISSION_REVOKED_COMPAT















            | FLAG_PERMISSION_ONE_TIME















            | FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED













            | FLAG_PERMISSION_AUTO_REVOKE_USER_SET;













            | FLAG_PERMISSION_AUTO_REVOKE_USER_SET













            | FLAG_PERMISSION_AUTO_REVOKED;































    /**















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










@@ -4262,7 +4271,8 @@ public abstract class PackageManager {













            FLAG_PERMISSION_REVOKED_COMPAT,















            FLAG_PERMISSION_ONE_TIME,















            FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED,













            FLAG_PERMISSION_AUTO_REVOKE_USER_SET













            FLAG_PERMISSION_AUTO_REVOKE_USER_SET,













            FLAG_PERMISSION_AUTO_REVOKED















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface PermissionFlags {}










@@ -7401,6 +7411,7 @@ public abstract class PackageManager {













            case FLAG_PERMISSION_ONE_TIME: return "ONE_TIME";















            case FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED: return "AUTO_REVOKE_IF_UNUSED";















            case FLAG_PERMISSION_AUTO_REVOKE_USER_SET: return "AUTO_REVOKE_USER_SET";













            case FLAG_PERMISSION_AUTO_REVOKED: return "AUTO_REVOKED";















            default: return Integer.toString(flag);















        }















    }