diff options
| author | 2018-12-12 21:34:53 +0000 | |
|---|---|---|
| committer | 2018-12-12 21:34:53 +0000 | |
| commit | fcfb51fa4ea4c1566f929fd638e4d218aaee694d (patch) | |
| tree | f61d1025c713a67bde8994c36023a80b2b62d599 | |
| parent | 24b90d3bab44618e336fc594fea33ff65fbd6e2c (diff) | |
| parent | dad9b86571eb6bce801209d63b8f18611af5a2bd (diff) | |
Merge "Moved getWellbeingPackage() from SystemApi to TestApi."
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index feecdf8356ab..f241a84063a4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1226,7 +1226,6 @@ package android.content.pm { method public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String); method public abstract int getIntentVerificationStatusAsUser(java.lang.String, int); method public abstract int getPermissionFlags(java.lang.String, java.lang.String, android.os.UserHandle); - method public java.lang.String getWellbeingPackageName(); method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle); method public abstract int installExistingPackage(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException; method public abstract int installExistingPackage(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException; diff --git a/api/test-current.txt b/api/test-current.txt index 8d8999e6a30b..627ef22a5d56 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -362,6 +362,7 @@ package android.content.pm { method public abstract java.lang.String getPermissionControllerPackageName(); method public abstract java.lang.String getServicesSystemSharedLibraryPackageName(); method public abstract java.lang.String getSharedSystemSharedLibraryPackageName(); + method public java.lang.String getWellbeingPackageName(); method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle); method public abstract void revokeRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle); field public static final java.lang.String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index da39b6394f8f..8f5883a0d878 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -6448,7 +6448,7 @@ public abstract class PackageManager { * * @hide */ - @SystemApi + @TestApi public String getWellbeingPackageName() { throw new UnsupportedOperationException( "getWellbeingPackageName not implemented in subclass"); |