commit fc48118694c6b47810a7694328e5e50caaa4830a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 19 23:13:51 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 19 23:13:51 2019 +0000
tree 5b57fe54d0d7ad42606bcc9088f966a23347ef19
parent 022af8ca10687da3078cfd45efd5daf89b39c080
parent 2632f45010ab74516bbe1c3b384de60f9da3bf27

Merge "Fix battery robo test" into qt-dev

src/com/android/settings/fuelgauge/BatteryMeterView.java

diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index 4485508..27923ef 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -82,7 +82,7 @@
     }
 
     public int getBatteryLevel() {
-        return mDrawable.getLevel();
+        return mDrawable.getBatteryLevel();
     }
 
     public void setCharging(boolean charging) {

tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 97ea75f..5be7274 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 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 @@
     }
 
     @Test
-    @Ignore("b/130896701")
     public void displayPreference_displayBatteryLevel() {
         mController.displayPreference(mPreferenceScreen);
 
@@ -190,7 +188,6 @@
     }
 
     @Test
-    @Ignore("b/130896701")
     public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
         mSummary.setText(BATTERY_STATUS);
         mSummary2.setText(BATTERY_STATUS);