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

Commit db77bc14 authored by Eugene Susla's avatar Eugene Susla
Browse files

Introduce per-app manifest flags for autoRevoke 

This introduces extra attributes on <application/> tag corresponding to
requesting to be shown in UI for the user to disable auto-revoke
(allowDontAutoRevokePermissions)
and being whitelisted by the installer (dontAutoRevokePermissions)

Test: presubmit
Bug: 146513245
Change-Id: I07902632812b70ea418a667d343b74d7ae170bb9
parent 60a4479b

api/current.txt

+5 −3
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ package android { 
    field public static final int allowAudioPlaybackCapture = 16844289; // 0x1010601

    field public static final int allowBackup = 16843392; // 0x1010280

    field public static final int allowClearUserData = 16842757; // 0x1010005

    field public static final int allowDontAutoRevokePermissions = 16844309; // 0x1010615

    field public static final int allowEmbedded = 16843765; // 0x10103f5

    field public static final int allowNativeHeapPointerTagging = 16844307; // 0x1010613

    field public static final int allowParallelSyncs = 16843570; // 0x1010332
@@ -572,7 +573,7 @@ package android { 
    field public static final int elevation = 16843840; // 0x1010440

    field public static final int ellipsize = 16842923; // 0x10100ab

    field public static final int ems = 16843096; // 0x1010158

    field public static final int enableGwpAsan = 16844310; // 0x1010616

    field public static final int enableGwpAsan = 16844312; // 0x1010618

    field public static final int enableVrMode = 16844069; // 0x1010525

    field public static final int enabled = 16842766; // 0x101000e

    field public static final int end = 16843996; // 0x10104dc
@@ -954,7 +955,7 @@ package android { 
    field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad

    field public static final int mediaRouteTypes = 16843694; // 0x10103ae

    field public static final int menuCategory = 16843230; // 0x10101de

    field public static final int mimeGroup = 16844309; // 0x1010615

    field public static final int mimeGroup = 16844311; // 0x1010617

    field public static final int mimeType = 16842790; // 0x1010026

    field public static final int min = 16844089; // 0x1010539

    field public static final int minAspectRatio = 16844187; // 0x101059b
@@ -1083,7 +1084,7 @@ package android { 
    field public static final int preferenceScreenStyle = 16842891; // 0x101008b

    field public static final int preferenceStyle = 16842894; // 0x101008e

    field public static final int presentationTheme = 16843712; // 0x10103c0

    field public static final int preserveLegacyExternalStorage = 16844308; // 0x1010614

    field public static final int preserveLegacyExternalStorage = 16844310; // 0x1010616

    field public static final int previewImage = 16843482; // 0x10102da

    field public static final int primaryContentAlpha = 16844114; // 0x1010552

    field public static final int priority = 16842780; // 0x101001c
@@ -1140,6 +1141,7 @@ package android { 
    field public static final int reqKeyboardType = 16843304; // 0x1010228

    field public static final int reqNavigation = 16843306; // 0x101022a

    field public static final int reqTouchScreen = 16843303; // 0x1010227

    field public static final int requestDontAutoRevokePermissions = 16844308; // 0x1010614

    field public static final int requestLegacyExternalStorage = 16844291; // 0x1010603

    field public static final int requireDeviceUnlock = 16843756; // 0x10103ec

    field public static final int required = 16843406; // 0x101028e

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -8948,6 +8948,8 @@ package android.permission { 
  }















  public final class PermissionManager {













    method @NonNull @RequiresPermission(android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY) public java.util.Set<java.lang.String> getAutoRevokeExemptionGrantedPackages();













    method @NonNull @RequiresPermission(android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY) public java.util.Set<java.lang.String> getAutoRevokeExemptionRequestedPackages();















    method @IntRange(from=0) @RequiresPermission(anyOf={android.Manifest.permission.ADJUST_RUNTIME_PERMISSIONS_POLICY, android.Manifest.permission.UPGRADE_RUNTIME_PERMISSIONS}) public int getRuntimePermissionsVersion();















    method @NonNull public java.util.List<android.permission.PermissionManager.SplitPermissionInfo> getSplitPermissions();















    method @RequiresPermission(android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS) public void grantDefaultPermissionsToEnabledCarrierApps(@NonNull String[], @NonNull android.os.UserHandle, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);

























core/java/android/content/pm/parsing/ParsingPackage.java



+5
−1




























Original line number
Diff line number
Diff line








@@ -192,6 +192,10 @@ public interface ParsingPackage extends ParsingPackageRead {





























    ParsingPackage setAllowNativeHeapPointerTagging(boolean allowNativeHeapPointerTagging);





























    ParsingPackage setDontAutoRevokePermissions(boolean dontAutoRevokePermissions);



























    ParsingPackage setAllowDontAutoRevokePermissions(boolean allowDontAutoRevokePermissions);





























    ParsingPackage setPreserveLegacyExternalStorage(boolean preserveLegacyExternalStorage);































    ParsingPackage setRestoreAnyVersion(boolean restoreAnyVersion);

































core/java/android/content/pm/parsing/ParsingPackageImpl.java



+28
−0




























Original line number
Diff line number
Diff line








@@ -405,6 +405,8 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable {













    private boolean hasFragileUserData;















    private boolean cantSaveState;















    private boolean allowNativeHeapPointerTagging;













    private boolean dontAutoRevokePermissions;













    private boolean allowDontAutoRevokePermissions;















    private boolean preserveLegacyExternalStorage;































    @Nullable










@@ -1089,6 +1091,8 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable {













        dest.writeBoolean(this.hasFragileUserData);















        dest.writeBoolean(this.cantSaveState);















        dest.writeBoolean(this.allowNativeHeapPointerTagging);













        dest.writeBoolean(this.dontAutoRevokePermissions);













        dest.writeBoolean(this.allowDontAutoRevokePermissions);















        dest.writeBoolean(this.preserveLegacyExternalStorage);















        dest.writeArraySet(this.mimeGroups);















        sForBoolean.parcel(this.enableGwpAsan, dest, flags);










@@ -1247,6 +1251,8 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable {













        this.hasFragileUserData = in.readBoolean();















        this.cantSaveState = in.readBoolean();















        this.allowNativeHeapPointerTagging = in.readBoolean();













        this.dontAutoRevokePermissions = in.readBoolean();













        this.allowDontAutoRevokePermissions = in.readBoolean();















        this.preserveLegacyExternalStorage = in.readBoolean();















        this.mimeGroups = (ArraySet<String>) in.readArraySet(boot);















        this.enableGwpAsan = sForBoolean.unparcel(in);










@@ -2022,6 +2028,16 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable {













        return allowNativeHeapPointerTagging;















    }





























    @Override













    public boolean isDontAutoRevokePermmissions() {













        return dontAutoRevokePermissions;













    }



























    @Override













    public boolean isAllowDontAutoRevokePermmissions() {













        return allowDontAutoRevokePermissions;













    }





























    @Override















    public boolean hasPreserveLegacyExternalStorage() {















        return preserveLegacyExternalStorage;










@@ -2492,6 +2508,18 @@ public class ParsingPackageImpl implements ParsingPackage, Parcelable {













        return this;















    }





























    @Override













    public ParsingPackageImpl setDontAutoRevokePermissions(boolean value) {













        dontAutoRevokePermissions = value;













        return this;













    }



























    @Override













    public ParsingPackageImpl setAllowDontAutoRevokePermissions(boolean value) {













        allowDontAutoRevokePermissions = value;













        return this;













    }





























    @Override















    public ParsingPackageImpl setPreserveLegacyExternalStorage(boolean value) {















        preserveLegacyExternalStorage = value;

































core/java/android/content/pm/parsing/ParsingPackageRead.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -771,6 +771,12 @@ public interface ParsingPackageRead extends Parcelable {













    /** @see ApplicationInfo#PRIVATE_FLAG_ALLOW_NATIVE_HEAP_POINTER_TAGGING */















    boolean isAllowNativeHeapPointerTagging();





























    /** @see ApplicationInfo#PRIVATE_FLAG2_DONT_AUTO_REVOKE_PERMISSIONS */













    boolean isDontAutoRevokePermmissions();



























    /** @see ApplicationInfo#PRIVATE_FLAG2_ALLOW_DONT_AUTO_REVOKE_PERMISSIONS */













    boolean isAllowDontAutoRevokePermmissions();





























    boolean hasPreserveLegacyExternalStorage();































    /**