Merge "Fix minor issues." into udc-dev (756143de) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -8684,6 +8684,7 @@ public class DevicePolicyManager {
		*/
		@RequiresPermission(anyOf = {SET_TIME, QUERY_ADMIN_POLICY}, conditional = true)
		public boolean getAutoTimeEnabled(@Nullable ComponentName admin) {
		throwIfParentInstance("getAutoTimeEnabled");
		if (mService != null) {
		try {
		return mService.getAutoTimeEnabled(admin, mContext.getPackageName());

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

+12 −5

Original line number	Diff line number	Diff line
		@@ -447,6 +447,7 @@ import android.util.AtomicFile;
		import android.util.DebugUtils;
		import android.util.IndentingPrintWriter;
		import android.util.IntArray;
		import android.util.Log;
		import android.util.Pair;
		import android.util.Slog;
		import android.util.SparseArray;
		@@ -12080,7 +12081,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		Objects.requireNonNull(who, "ComponentName is null");
		final CallerIdentity caller = getCallerIdentity(who);
		Preconditions.checkCallAuthorization(
		isDeviceOwner(caller) \|\| isProfileOwner(caller));
		isDefaultDeviceOwner(caller) \|\| isProfileOwner(caller));

		if (packageList != null) {
		for (String pkg : packageList) {
		@@ -13365,8 +13366,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		PolicyDefinition<Boolean> policyDefinition =
		PolicyDefinition.getPolicyDefinitionForUserRestriction(key);
		if (enabledFromThisOwner) {
		// TODO: Remove this special case - replace with breaking change to require
		// setGlobally to disable ADB
		if (key.equals(UserManager.DISALLOW_DEBUGGING_FEATURES) && parent) {
		setGlobalUserRestrictionInternal(admin, key, /* enabled= */ true);
		} else {
		setLocalUserRestrictionInternal(
		admin, key, /* enabled= */ true, affectedUserId);
		}
		} else {
		// Remove any local and global policy that was set by the admin
		if (!policyDefinition.isLocalOnlyPolicy()) {
		@@ -15155,7 +15162,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		}
		DevicePolicyEventLogger
		.createEvent(DevicePolicyEnums.SET_LOCKTASK_MODE_ENABLED)
		.setAdmin(admin.info.getPackageName())
		.setAdmin(admin.info == null ? null : admin.info.getPackageName())
		.setBoolean(isEnabled)
		.setStrings(pkg)
		.write();
		@@ -22721,7 +22728,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
		}

		private void handleFinancedDeviceKioskRoleChange() {
		if (!isPermissionCheckFlagEnabled()) {
		if (!isPolicyEngineForFinanceFlagEnabled()) {
		return;
		}
		Slog.i(LOG_TAG, "Handling action " + ACTION_DEVICE_FINANCING_STATE_CHANGED);