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

DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called

Browse Source 
am: 5c64223da4

Change-Id: I37fabc41064e7fd0a1c42dab61697f74721e0beb
This commit is contained in:
Michal Karpinski
2016-12-14 10:54:55 +00:00
committed by android-build-merger
parent eaaf9a1213 5c64223da4
commit a507f28143
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6049,6 +6049,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
private void clearDeviceOwnerLocked(ActiveAdmin admin, int userId) { private void clearDeviceOwnerLocked(ActiveAdmin admin, int userId) {
disableDeviceOwnerManagedSingleUserFeaturesIfNeeded();
if (admin != null) { if (admin != null) {
admin.disableCamera = false; admin.disableCamera = false;
admin.userRestrictions = null; admin.userRestrictions = null;
@@ -6060,7 +6061,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
mOwners.clearDeviceOwner(); mOwners.clearDeviceOwner();
mOwners.writeDeviceOwner(); mOwners.writeDeviceOwner();
updateDeviceOwnerLocked(); updateDeviceOwnerLocked();
disableDeviceOwnerManagedSingleUserFeaturesIfNeeded();
try { try {
if (mInjector.getIBackupManager() != null) { if (mInjector.getIBackupManager() != null) {
// Reactivate backup service. // Reactivate backup service.