08c920219ef520415f8c63aabf0ff041c20cac55 - platform/frameworks/base

commit	08c920219ef520415f8c63aabf0ff041c20cac55	[log] [tgz]
author	Felipe Leme <felipeal@google.com>	Fri Feb 08 14:19:55 2019 -0800
committer	Felipe Leme <felipeal@google.com>	Fri Feb 08 14:54:53 2019 -0800
tree	df30caabc3aab538c540267104b032899b982499
parent	a4cceec0b9abe52e6d76fe45b442c95a6dfb397a [diff]

Added DISALLOW_CONTENT_CAPTURE to UserRestrictionsUtils.

Also fixed FrameworkResourcesServiceNameResolver.isDefaultServiceEnabled()

Test: atest MixedManagedProfileOwnerTest#testDisallowContentCapture_allowed \
            MixedManagedProfileOwnerTest#testSetUserRestrictionLogged \
            MixedDeviceOwnerTest#testDisallowContentCapture_allowed \
            MixedDeviceOwnerTest#testSetUserRestrictionLogged \
            MixedProfileOwnerTest#testDisallowContentCapture_allowed \
            MixedProfileOwnerTest#testSetUserRestrictionLogged \
Bug: 123406031

Change-Id: If80257a1023229adcb19f41c90deb2de07ab6c7c

services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerServiceShellCommand.java[diff]
services/core/java/com/android/server/infra/FrameworkResourcesServiceNameResolver.java[diff]
services/core/java/com/android/server/pm/UserRestrictionsUtils.java[diff]

3 files changed