Merge "Fix typo on DISALLOW_UNMUTE_DEVICE"
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index a7b2e3f..21c70f9 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -644,7 +644,7 @@
* @see #getUserRestrictions()
* @hide
*/
- public static final String DISALLLOW_UNMUTE_DEVICE = "disallow_unmute_device";
+ public static final String DISALLOW_UNMUTE_DEVICE = "disallow_unmute_device";
/**
* Specifies if a user is not allowed to use cellular data when roaming. This can only be set by
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 0860e5b..8d0111b 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1165,7 +1165,7 @@
// Check the current user restriction.
boolean masterMute =
mUserManagerInternal.getUserRestriction(currentUser,
- UserManager.DISALLLOW_UNMUTE_DEVICE)
+ UserManager.DISALLOW_UNMUTE_DEVICE)
|| mUserManagerInternal.getUserRestriction(currentUser,
UserManager.DISALLOW_ADJUST_VOLUME);
if (mUseFixedVolume) {
@@ -5486,10 +5486,10 @@
{
final boolean wasRestricted =
prevRestrictions.getBoolean(UserManager.DISALLOW_ADJUST_VOLUME)
- || prevRestrictions.getBoolean(UserManager.DISALLLOW_UNMUTE_DEVICE);
+ || prevRestrictions.getBoolean(UserManager.DISALLOW_UNMUTE_DEVICE);
final boolean isRestricted =
newRestrictions.getBoolean(UserManager.DISALLOW_ADJUST_VOLUME)
- || newRestrictions.getBoolean(UserManager.DISALLLOW_UNMUTE_DEVICE);
+ || newRestrictions.getBoolean(UserManager.DISALLOW_UNMUTE_DEVICE);
if (wasRestricted != isRestricted) {
setMasterMuteInternalNoCallerCheck(isRestricted, /* flags =*/ 0, userId);
}
diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
index 0a1574b..fb8429d 100644
--- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
+++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java
@@ -108,7 +108,7 @@
UserManager.DISALLOW_SET_USER_ICON,
UserManager.DISALLOW_SET_WALLPAPER,
UserManager.DISALLOW_OEM_UNLOCK,
- UserManager.DISALLLOW_UNMUTE_DEVICE,
+ UserManager.DISALLOW_UNMUTE_DEVICE,
});
/**
@@ -156,7 +156,7 @@
UserManager.DISALLOW_ADJUST_VOLUME,
UserManager.DISALLOW_RUN_IN_BACKGROUND,
UserManager.DISALLOW_UNMUTE_MICROPHONE,
- UserManager.DISALLLOW_UNMUTE_DEVICE
+ UserManager.DISALLOW_UNMUTE_DEVICE
);
/**
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 5bd2e93..22dd9d7 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8741,7 +8741,7 @@
Preconditions.checkNotNull(who, "ComponentName is null");
synchronized (this) {
getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER);
- setUserRestriction(who, UserManager.DISALLLOW_UNMUTE_DEVICE, on);
+ setUserRestriction(who, UserManager.DISALLOW_UNMUTE_DEVICE, on);
}
}