commit 75ec5465f046149f4b53976a1cfd5f46dc51e944
author Michal Karpinski <mkarpinski@google.com> Wed Nov 16 11:46:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 16 11:46:18 2016 +0000
tree 2f5b3f2b55f09218b78542c50e0c67f37f504ce0
parent 7b4d85018722ee67bdc70c169ff61e40d5ae7924
parent c44e67961170ddfb668372dc6e9ce6b391e3740f

Merge "Fix disabling DO single user features when clearDeviceOwner() is called"

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 8bb8915..543bba6 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -6041,6 +6041,7 @@
     }
 
     private void clearDeviceOwnerLocked(ActiveAdmin admin, int userId) {
+        disableDeviceOwnerManagedSingleUserFeaturesIfNeeded();
         if (admin != null) {
             admin.disableCamera = false;
             admin.userRestrictions = null;
@@ -6052,7 +6053,6 @@
         mOwners.clearDeviceOwner();
         mOwners.writeDeviceOwner();
         updateDeviceOwnerLocked();
-        disableDeviceOwnerManagedSingleUserFeaturesIfNeeded();
         try {
             if (mInjector.getIBackupManager() != null) {
                 // Reactivate backup service.