Refactor permissions code for bluetooth controller enabler am: a8db5ccea8

am: b32159f242

Change-Id: I7734f18a3fd1c5abc401131862701c47bfae64c9
This commit is contained in:
Salvador Martinez
2017-08-08 03:07:08 +00:00
committed by android-build-merger
2 changed files with 36 additions and 6 deletions

View File

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

View File

@@ -0,0 +1,24 @@
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;
}
}