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

Commit fcfb51fa authored by Varun Shah's avatar Varun Shah Committed by Android (Google) Code Review
Browse files

Merge "Moved getWellbeingPackage() from SystemApi to TestApi."

parents 24b90d3b dad9b865

api/system-current.txt

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

api/test-current.txt

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

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

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

     * @hide

     */

    @SystemApi

    @TestApi

    public String getWellbeingPackageName() {

        throw new UnsupportedOperationException(

                "getWellbeingPackageName not implemented in subclass");