diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/removed.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/IUserManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 18 | ||||
| -rw-r--r-- | core/java/com/android/internal/app/UnlaunchableAppActivity.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/ManagedProfileControllerImpl.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 4 |
7 files changed, 19 insertions, 12 deletions
diff --git a/api/current.txt b/api/current.txt index c4ab90027443..af9f89e3d9ae 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/api/removed.txt b/api/removed.txt index 2aab223ed281..77088e5bdab7 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -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); } } diff --git a/core/java/android/os/IUserManager.aidl b/core/java/android/os/IUserManager.aidl index 01d6b022043f..65e9473380ce 100644 --- a/core/java/android/os/IUserManager.aidl +++ b/core/java/android/os/IUserManager.aidl @@ -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(); } diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 4e94c321e0a5..9ececa6be2a2 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -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(); diff --git a/core/java/com/android/internal/app/UnlaunchableAppActivity.java b/core/java/com/android/internal/app/UnlaunchableAppActivity.java index 2eadaf3a06b0..902c8c1662ea 100644 --- a/core/java/com/android/internal/app/UnlaunchableAppActivity.java +++ b/core/java/com/android/internal/app/UnlaunchableAppActivity.java @@ -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); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ManagedProfileControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ManagedProfileControllerImpl.java index 7f4deb0372f5..0f8d59b12ddb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ManagedProfileControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ManagedProfileControllerImpl.java @@ -61,7 +61,7 @@ public class ManagedProfileControllerImpl implements ManagedProfileController { public void setWorkModeEnabled(boolean enableWorkMode) { synchronized (mProfiles) { for (UserInfo ui : mProfiles) { - if (!mUserManager.trySetQuietModeEnabled(!enableWorkMode, UserHandle.of(ui.id))) { + if (!mUserManager.requestQuietModeEnabled(!enableWorkMode, UserHandle.of(ui.id))) { StatusBarManager statusBarManager = (StatusBarManager) mContext .getSystemService(android.app.Service.STATUS_BAR_SERVICE); statusBarManager.collapsePanels(); diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 7d575668da94..92fd9041b32d 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -394,7 +394,7 @@ public class UserManagerService extends IUserManager.Stub { /** * Start an {@link IntentSender} when user is unlocked after disabling quiet mode. * - * @see {@link #trySetQuietModeEnabled(String, boolean, int, IntentSender)} + * @see {@link #requestQuietModeEnabled(String, boolean, int, IntentSender)} */ private class DisableQuietModeUserUnlockedCallback extends IProgressListener.Stub { private final IntentSender mTarget; @@ -823,7 +823,7 @@ public class UserManagerService extends IUserManager.Stub { } @Override - public boolean trySetQuietModeEnabled(@NonNull String callingPackage, boolean enableQuietMode, + public boolean requestQuietModeEnabled(@NonNull String callingPackage, boolean enableQuietMode, int userHandle, @Nullable IntentSender target) { Preconditions.checkNotNull(callingPackage); |