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

Commit d4f6ceca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename trySetQuietModeEnabled to requestQuietModeEnabled as per ... the... 

Merge "Rename trySetQuietModeEnabled to requestQuietModeEnabled as per ... the feedback from API council"
parents 2cd5144d bece85dd

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32438,12 +32438,12 @@ package android.os { 
    method public boolean isUserRunningOrStopping(android.os.UserHandle);

    method public boolean isUserUnlocked();

    method public boolean isUserUnlocked(android.os.UserHandle);

    method public boolean requestQuietModeEnabled(boolean, android.os.UserHandle);

    method public deprecated boolean setRestrictionsChallenge(java.lang.String);

    method public deprecated void setUserRestriction(java.lang.String, boolean);

    method public deprecated void setUserRestrictions(android.os.Bundle);

    method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle);

    method public static boolean supportsMultipleUsers();

    method public boolean trySetQuietModeEnabled(boolean, android.os.UserHandle);

    field public static final java.lang.String ALLOW_PARENT_PROFILE_APP_LINKING = "allow_parent_profile_app_linking";

    field public static final java.lang.String DISALLOW_ADD_MANAGED_PROFILE = "no_add_managed_profile";

    field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";

api/removed.txt

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ package android.os { 
    method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);

    method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);

    method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);

    method public deprecated boolean trySetQuietModeEnabled(boolean, android.os.UserHandle);

  }



}

core/java/android/os/IUserManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ interface IUserManager { 
    boolean isUserRunning(int userId);

    boolean isUserNameSet(int userHandle);

    boolean hasRestrictedProfiles();

    boolean trySetQuietModeEnabled(String callingPackage, boolean enableQuietMode, int userHandle, in IntentSender target);

    boolean requestQuietModeEnabled(String callingPackage, boolean enableQuietMode, int userHandle, in IntentSender target);

    long getUserStartRealtime();

    long getUserUnlockRealtime();

}

core/java/android/os/UserManager.java

+12 −6
Original line number Diff line number Diff line
@@ -2209,6 +2209,12 @@ public class UserManager { 
        }

    }



    /** @removed */

    @Deprecated

    public boolean trySetQuietModeEnabled(boolean enableQuietMode, @NonNull UserHandle userHandle) {

        return requestQuietModeEnabled(enableQuietMode, userHandle);

    }



    /**

     * Enables or disables quiet mode for a managed profile. If quiet mode is enabled, apps in a

     * managed profile don't run, generate notifications, or consume data or battery.
@@ -2234,22 +2240,22 @@ public class UserManager { 
     *

     * @see #isQuietModeEnabled(UserHandle)

     */

    public boolean trySetQuietModeEnabled(boolean enableQuietMode, @NonNull UserHandle userHandle) {

        return trySetQuietModeEnabled(enableQuietMode, userHandle, null);

    public boolean requestQuietModeEnabled(boolean enableQuietMode, @NonNull UserHandle userHandle) {

        return requestQuietModeEnabled(enableQuietMode, userHandle, null);

    }



    /**

     * Similar to {@link #trySetQuietModeEnabled(boolean, UserHandle)}, except you can specify

     * Similar to {@link #requestQuietModeEnabled(boolean, UserHandle)}, except you can specify

     * a target to start when user is unlocked. If {@code target} is specified, caller must have

     * the {@link android.Manifest.permission#MANAGE_USERS} permission.

     *

     * @see {@link #trySetQuietModeEnabled(boolean, UserHandle)}

     * @see {@link #requestQuietModeEnabled(boolean, UserHandle)}

     * @hide

     */

    public boolean trySetQuietModeEnabled(

    public boolean requestQuietModeEnabled(

            boolean enableQuietMode, @NonNull UserHandle userHandle, IntentSender target) {

        try {

            return mService.trySetQuietModeEnabled(

            return mService.requestQuietModeEnabled(

                    mContext.getPackageName(), enableQuietMode, userHandle.getIdentifier(), target);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

core/java/com/android/internal/app/UnlaunchableAppActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class UnlaunchableAppActivity extends Activity 
    @Override

    public void onClick(DialogInterface dialog, int which) {

        if (mReason == UNLAUNCHABLE_REASON_QUIET_MODE && which == DialogInterface.BUTTON_POSITIVE) {

            UserManager.get(this).trySetQuietModeEnabled(false, UserHandle.of(mUserId), mTarget);

            UserManager.get(this).requestQuietModeEnabled(false, UserHandle.of(mUserId), mTarget);

        }

    }