Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix typo on DISALLOW_UNMUTE_DEVICE"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-13 18:48:24 +00:00
committed by Android (Google) Code Review
parent 60bcd2485d 492b4724fb
commit 33a119c94f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/UserManager.java
View File

@@ -644,7 +644,7 @@ public class UserManager {
* @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

6
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -1165,7 +1165,7 @@ public class AudioService extends IAudioService.Stub
// 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 @@ public class AudioService extends IAudioService.Stub
{
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);
}

4
services/core/java/com/android/server/pm/UserRestrictionsUtils.java
View File

@@ -108,7 +108,7 @@ public class UserRestrictionsUtils {
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 @@ public class UserRestrictionsUtils {
UserManager.DISALLOW_ADJUST_VOLUME,
UserManager.DISALLOW_RUN_IN_BACKGROUND,
UserManager.DISALLOW_UNMUTE_MICROPHONE,
UserManager.DISALLLOW_UNMUTE_DEVICE
UserManager.DISALLOW_UNMUTE_DEVICE
);
/**

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -8741,7 +8741,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
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);
}
}