Merge "Add a new config for checking BatteryManager show/hide rule" into udc-dev

src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java

@@ -50,8 +50,13 @@ public class BatteryManagerPreferenceController extends BasePreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return mPowerUsageFeatureProvider.isBatteryManagerSupported()
-                    && mPowerUsageFeatureProvider.isAdaptiveChargingSupported()
+        if (!mPowerUsageFeatureProvider.isBatteryManagerSupported()) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        if (!mContext.getResources().getBoolean(R.bool.config_battery_manager_consider_ac)) {
+            return AVAILABLE_UNSEARCHABLE;
+        }
+        return mPowerUsageFeatureProvider.isAdaptiveChargingSupported()
                 ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
     }