Merge "Refactor tether logic for reuse" into oc-mr1-dev
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index 3d7c5b6..1bda130 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -210,12 +210,7 @@
*/
@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 @@
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;
+ }
+
}
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
index b0e34fa..fc746b9 100644
--- a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
+++ b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
@@ -49,7 +49,9 @@
public void handlePositiveAction(Anomaly anomaly, int contextMetricsKey) {
super.handlePositiveAction(anomaly, contextMetricsKey);
mRuntimePermissionPresenter.revokeRuntimePermission(anomaly.packageName,
- Manifest.permission_group.LOCATION);
+ Manifest.permission.ACCESS_COARSE_LOCATION);
+ mRuntimePermissionPresenter.revokeRuntimePermission(anomaly.packageName,
+ Manifest.permission.ACCESS_FINE_LOCATION);
}
@Override
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java
new file mode 100644
index 0000000..f39f10f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java
@@ -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;
+ }
+}