Refactor permissions code for bluetooth controller enabler (b1c0e382) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/BluetoothEnabler.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -210,12 +210,7 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh
		*/
		@VisibleForTesting
		boolean maybeEnforceRestrictions() {
		EnforcedAdmin admin = mRestrictionUtils.checkIfRestrictionEnforced(
		mContext, UserManager.DISALLOW_BLUETOOTH);
		if (admin == null) {
		admin = mRestrictionUtils.checkIfRestrictionEnforced(
		mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH);
		}
		EnforcedAdmin admin = getEnforcedAdmin(mRestrictionUtils, mContext);
		mSwitchWidget.setDisabledByAdmin(admin);
		if (admin != null) {
		mSwitchWidget.setChecked(false);
		@@ -227,4 +222,15 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh
		return admin != null;
		}

		public static EnforcedAdmin getEnforcedAdmin(RestrictionUtils mRestrictionUtils,
		Context mContext) {
		EnforcedAdmin admin = mRestrictionUtils.checkIfRestrictionEnforced(
		mContext, UserManager.DISALLOW_BLUETOOTH);
		if (admin == null) {
		admin = mRestrictionUtils.checkIfRestrictionEnforced(
		mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH);
		}
		return admin;
		}

		}

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		package com.android.settings.testutils.shadow;

		import android.content.Context;
		import com.android.settings.bluetooth.RestrictionUtils;
		import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
		import org.robolectric.annotation.Implementation;
		import org.robolectric.annotation.Implements;

		@Implements(RestrictionUtils.class)
		public class ShadowRestrictionUtils {
		private static boolean isRestricted = false;

		@Implementation
		public EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) {
		if (isRestricted) {
		return new EnforcedAdmin();
		}
		return null;
		}

		public static void setRestricted(boolean restricted) {
		isRestricted = restricted;
		}
		}