diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java index 44855087170..27923ef7efd 100644 --- a/src/com/android/settings/fuelgauge/BatteryMeterView.java +++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java @@ -82,7 +82,7 @@ public class BatteryMeterView extends ImageView { } public int getBatteryLevel() { - return mDrawable.getLevel(); + return mDrawable.getBatteryLevel(); } public void setCharging(boolean charging) { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 97ea75fdaaa..5be72744f5c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -50,7 +50,6 @@ import com.android.settingslib.widget.LayoutPreference; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -136,7 +135,6 @@ public class BatteryHeaderPreferenceControllerTest { } @Test - @Ignore("b/130896701") public void displayPreference_displayBatteryLevel() { mController.displayPreference(mPreferenceScreen); @@ -190,7 +188,6 @@ public class BatteryHeaderPreferenceControllerTest { } @Test - @Ignore("b/130896701") public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() { mSummary.setText(BATTERY_STATUS); mSummary2.setText(BATTERY_STATUS);