From dad9b86571eb6bce801209d63b8f18611af5a2bd Mon Sep 17 00:00:00 2001 From: Varun Shah Date: Mon, 10 Dec 2018 20:17:31 -0800 Subject: Moved getWellbeingPackage() from SystemApi to TestApi. Changed PackageManager#getWellbeingPackage from System to Test API since the related GTS using the API is now being built against the test sdk. Bug: 119330345 Test: atest com.google.android.wellbeing.permissionpolicy.gts.WellbeingPermissionPolicyTest Change-Id: Id80f52a327f3faa292e7c647cac2b1fa0e03275f --- api/system-current.txt | 1 - api/test-current.txt | 1 + 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 1bd77adc4e3c..869f43329c67 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1258,7 +1258,6 @@ package android.content.pm { method public abstract java.util.List 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 7ef58f121885..110996221082 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -361,6 +361,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 0150f6a2765d..97c30b49d454 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -6438,7 +6438,7 @@ public abstract class PackageManager { * * @hide */ - @SystemApi + @TestApi public String getWellbeingPackageName() { throw new UnsupportedOperationException( "getWellbeingPackageName not implemented in subclass"); -- cgit v1.2.3-59-g8ed1b