DevicePolicy: Restore backup manager if the device owner is cleared

Change I3fe54e43324c15dabd56834a923e8e8cb4eea98d permanently disables
the backup manager when a device owner is set. Put the service back
if the owner is cleared

Addresses CYNGNOS-779
Fixes android.security.cts.ServicePermissionsTest#testDumpProtected when
run after com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement

Change-Id: I1c5bc39f6feb6be03975cedc16185378bbc28473

1 files changed, 8 insertions, 0 deletions

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index c1a4243..3b8d3c4 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -4263,6 +4263,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
                 mDeviceOwner.clearDeviceOwner();
                 mDeviceOwner.writeOwnerFile();
                 updateDeviceOwnerLocked();
+                // Restore backup manager.
+                try {
+                    IBackupManager ibm = IBackupManager.Stub.asInterface(
+                            ServiceManager.getService(Context.BACKUP_SERVICE));
+                    ibm.setBackupServiceActive(UserHandle.USER_OWNER, true);
+                } catch (RemoteException e) {
+                    throw new IllegalStateException("Failed activating backup service.", e);
+                }
             }
         }
     }