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

Commit dad9b865 authored by Varun Shah's avatar Varun Shah
Browse files

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
parent 4c2a9b48

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1258,7 +1258,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;

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

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

+1 −1
Original line number Diff line number Diff line
@@ -6438,7 +6438,7 @@ public abstract class PackageManager { 
     *

     * @hide

     */

    @SystemApi

    @TestApi

    public String getWellbeingPackageName() {

        throw new UnsupportedOperationException(

                "getWellbeingPackageName not implemented in subclass");