diff options
| author | Alex Johnston <acjohnston@google.com> | 2020-02-19 16:29:38 +0000 |
|---|---|---|
| committer | Alex Johnston <acjohnston@google.com> | 2020-03-18 10:16:37 +0000 |
| commit | d4c416fd7a2ee32ac89ee251f332a950f5e347b8 (patch) | |
| tree | eca696b53e0efa67305057addc00d86ade93ea45 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 777531511fb4e9199d36c78c2e070398dc5e1bb8 (diff) | |
Change the data structure of restrictions in UM
Background
* In an org-owned managed profile device, two admins
can set user restrictions on a user. The current
data structure of local user restrictions uses a
SparseArray<Bundle> where the key is the userId
and the value is the restriction bundle.
* The existing data structure cannot store both the
target userId and the originating userId.
Changes
* Introduces RestrictionsSet data structure, which is now
used as a replacement of SparseArray<Bundle>.
* Updates the data structure of local restrictions to
SparseArray<RestrictionsSet>. The first key is the
target userId and the second key is the originating userId.
* targetUserId -> originatingUserId -> restrictionBundle
* Numerous methods in UserManagerService and
UserRestrictionsUtils had to be changed to support this.
There will be follow up changes to move the logic of
sorting the restrictions into local and global restrictions
to DPMS.
Bug: 149743941
Test: atest com.android.server.pm.UserManagerTest
atest com.android.server.pm.RestrictionsSetTest
atest com.android.server.pm.UserRestrictionsUtilsTest
atest com.android.cts.devicepolicy.UserRestrictionsTest
Change-Id: I08c9d60aa7a5e7cc3c661aaa4ba6dcd4f218323b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions