4f16073556f7978708fb71c87628cfe1692412d5 - platform/frameworks/base

commit	4f16073556f7978708fb71c87628cfe1692412d5	[log] [tgz]
author	Makoto Onuki <omakoto@google.com>	Tue Oct 27 17:15:38 2015 -0700
committer	Makoto Onuki <omakoto@google.com>	Mon Nov 02 14:07:11 2015 -0800
tree	41b4f4894b90919638ed2d0054633a3b697838fd
parent	5263492de62c4dac099d0aa0f70056dbc729b06b [diff]

Make UserManager enforce user restrictions, not DPM.

- Now even if a user restriction is set via UserManager, it'll be correctly
enforced.

- Changed the way AudioService enforces the OP_MUTE_MICROPHONE and
OP_AUDIO_MASTER_VOLUME app ops -- previously, when they're set, even a muting
call would be rejected.  This was why DPMS.setUserRestriction() used different
calling orders for DISALLOW_UNMUTE_MICROPHONE/DISALLOW_ADJUST_VOLUME depending
on setting them or clearing them.
Now, even when the app ops are set, we still allow muting calls.

Bug 23902097
Bug 24981972

Change-Id: I865b5de43e15f5955f94006475a5ec6254904d31

services/core/java/com/android/server/audio/AudioService.java[diff]
services/core/java/com/android/server/pm/UserManagerService.java[diff]
services/core/java/com/android/server/pm/UserRestrictionsUtils.java[diff]
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java[diff]

4 files changed

tree: 41b4f4894b90919638ed2d0054633a3b697838fd