From 92bc5ca1d0720d26b0243f4ab5e350886b55ca84 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Mon, 17 Aug 2015 01:54:30 +0100 Subject: 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 --- .../android/server/devicepolicy/DevicePolicyManagerService.java | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'services') 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); + } } } } -- cgit v1.1