4c052f237a108457fca3d3864c5654ebd4505111 - platform/frameworks/base

commit	4c052f237a108457fca3d3864c5654ebd4505111	[log] [tgz]
author	Bartosz Fabianowski <bartfab@google.com>	Mon Jan 25 14:18:43 2016 +0100
committer	Bartosz Fabianowski <bartfab@google.com>	Mon Jan 25 14:18:43 2016 +0100
tree	0edca7593322d68b25682f9048abfd1b3c9461b1
parent	9ef46c26f1ef5230da0caf955a90474f3b7a14d9 [diff]

Implement user affiliation

A user/profile is considered affiliated if it is managed by the same
entity as the device. This is determined by having the device owner and
profile owners specify a set of opaque affiliation ids each. If the sets
intersect, they must have come from the same source, which means that the
device owner and profile owner are controlled by the same entity.

BUG=25599229

Change-Id: I393fe0de70272307ed3c811aaba4b48a5109c562

core/java/android/app/admin/DevicePolicyManager.java[diff]
core/java/android/app/admin/IDevicePolicyManager.aidl[diff]
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java[diff]
services/tests/servicestests/src/com/android/server/devicepolicy/DpmTestBase.java[diff]

5 files changed

tree: 0edca7593322d68b25682f9048abfd1b3c9461b1