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

Commit 3eff9e42 authored by Jordan Jozwiak's avatar Jordan Jozwiak Committed by Android (Google) Code Review
Browse files

Merge "Allow usage of constant in tests"

parents 40a61c00 142fe6a5

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -970,6 +970,7 @@ package android.content.pm { 
    method public boolean isSystemApp();

    field public static final int PRIVATE_FLAG_PRIVILEGED = 8; // 0x8

    field public int privateFlags;

    field public int targetSandboxVersion;

  }



  public class LauncherApps {
@@ -1017,6 +1018,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_DEFAULT = 32; // 0x20

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

    field public static final int FLAG_PERMISSION_ONE_TIME = 65536; // 0x10000

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

core/java/android/content/pm/ApplicationInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * @hide

     */

    @SystemApi

    @TestApi

    public int targetSandboxVersion;



    /**

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

+1 −0
Original line number Diff line number Diff line
@@ -3373,6 +3373,7 @@ public abstract class PackageManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT =  1 << 5;



    /**