summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author JW Wang <wangchun@google.com> 2020-02-08 01:01:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-02-08 01:01:36 +0000
commitb82819fc4d5851663f2d58bf18d48d5c59bcd854 (patch)
treeacf5be985e9f2dd865fa238227b2d496a341dbeb
parentdd7da4f061c6560f40cad250fe73abacb696b0a2 (diff)
parent6ff12da99794f33b23db546ed97e5a0426c00dbe (diff)
Merge "Add a test API PackageManager#MODULE_APEX_NAME (2/n)"
-rw-r--r--api/test-current.txt1
-rw-r--r--core/java/android/content/pm/PackageManager.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt
index 826c27546aad..e352cb65156e 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -923,6 +923,7 @@ package android.content.pm {
field public static final int FLAG_PERMISSION_USER_SET = 1; // 0x1
field public static final int MATCH_FACTORY_ONLY = 2097152; // 0x200000
field public static final int MATCH_KNOWN_PACKAGES = 4202496; // 0x402000
+ field public static final int MODULE_APEX_NAME = 1; // 0x1
field public static final String SYSTEM_SHARED_LIBRARY_SERVICES = "android.ext.services";
field public static final String SYSTEM_SHARED_LIBRARY_SHARED = "android.ext.shared";
}
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 9f7f4821a11e..e8668f1368fb 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -597,6 +597,7 @@ public abstract class PackageManager {
* @hide
*/
@SystemApi
+ @TestApi
public static final int MODULE_APEX_NAME = 0x00000001;
/** @hide */