diff options
| author | 2020-08-14 15:55:09 +0000 | |
|---|---|---|
| committer | 2020-08-14 15:55:09 +0000 | |
| commit | 3eff9e429fc70c3b69c6819b878c0a6336647baf (patch) | |
| tree | 1b47de6b0daee1f95e5400953831dc4ae9c8efaf | |
| parent | 40a61c002796d824a04eaffb1431a1e4b29e6eec (diff) | |
| parent | 142fe6a54448b6a4b4ee039e0021170ce94983de (diff) | |
Merge "Allow usage of constant in tests"
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/ApplicationInfo.java | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 10a367fa9267..a1d1fa781096 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 043953d1aabd..0c6810c07394 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -1134,6 +1134,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * @hide */ @SystemApi + @TestApi public int targetSandboxVersion; /** diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index e08af5534afd..7b2955db3318 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3373,6 +3373,7 @@ public abstract class PackageManager { * @hide */ @SystemApi + @TestApi public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 1 << 5; /** |