diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java index 1c4c67c8781..ff747e36791 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java @@ -51,6 +51,7 @@ public class BatteryManagerPreferenceController extends BasePreferenceController @Override public int getAvailabilityStatus() { return mPowerUsageFeatureProvider.isBatteryManagerSupported() + && mPowerUsageFeatureProvider.isAdaptiveChargingSupported() ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java index da0002c50a4..f9cac5640a5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java @@ -61,12 +61,6 @@ public class TopLevelBatteryPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } - @Test - @Config(qualifiers = "mcc999") - public void getAvailabilityStatus_unsupportedWhenSet() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); - } - @Test public void convertClassPathToComponentName_nullInput_returnsNull() { assertThat(mController.convertClassPathToComponentName(null)).isNull(); @@ -118,4 +112,4 @@ public class TopLevelBatteryPreferenceControllerTest { assertThat(mController.getSummary()) .isEqualTo(mContext.getString(R.string.battery_missing_message)); } -} \ No newline at end of file +} diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java index 36f891edb1a..218fa9e5a51 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -86,6 +86,7 @@ public class BatteryManagerPreferenceControllerTest { @Test public void getAvailabilityStatus_supportBatteryManager_showPrefPage() { when(mPowerUsageFeatureProvider.isBatteryManagerSupported()).thenReturn(true); + when(mPowerUsageFeatureProvider.isAdaptiveChargingSupported()).thenReturn(true); assertThat(mController.getAvailabilityStatus()).isEqualTo( BatteryManagerPreferenceController.AVAILABLE_UNSEARCHABLE); @@ -98,4 +99,13 @@ public class BatteryManagerPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo( BatteryManagerPreferenceController.UNSUPPORTED_ON_DEVICE); } + + @Test + public void getAvailabilityStatus_supportBatteryManagerWithoutAC_notShowPrefPage() { + when(mPowerUsageFeatureProvider.isBatteryManagerSupported()).thenReturn(true); + when(mPowerUsageFeatureProvider.isAdaptiveChargingSupported()).thenReturn(false); + + assertThat(mController.getAvailabilityStatus()).isEqualTo( + BatteryManagerPreferenceController.UNSUPPORTED_ON_DEVICE); + } }