resolve merge conflicts of 852c394 to master (2555a121) · Commits · e / os / android_frameworks_base

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

+15 −6

Original line number	Diff line number	Diff line
		@@ -496,6 +496,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		}
		});
		}
		// STOPSHIP: Remove this code once all dogfood devices are fixed. See b/31754835
		if (Intent.ACTION_BOOT_COMPLETED.equals(action) && !mOwners.hasDeviceOwner()
		&& !isBackupServiceEnabledInternal()) {
		setBackupServiceEnabledInternal(true);
		Slog.w(LOG_TAG, "Fix backup for device that is not in Device Owner mode.");
		}
		if (Intent.ACTION_USER_UNLOCKED.equals(action)
		\|\| Intent.ACTION_USER_STARTED.equals(action)
		\|\| KeyChain.ACTION_TRUST_STORE_CHANGED.equals(action)) {
		@@ -9350,6 +9356,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		}
		synchronized (this) {
		getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
		return isBackupServiceEnabledInternal();
		}
		}
		private boolean isBackupServiceEnabledInternal() {
		try {
		IBackupManager ibm = mInjector.getIBackupManager();
		return ibm != null && ibm.isBackupServiceActive(UserHandle.USER_SYSTEM);
		@@ -9357,7 +9367,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		throw new IllegalStateException("Failed requesting backup service state.", e);
		}
		}
		}

		/**
		* Return true if a given user has any accounts that'll prevent installing a device or profile