From 2632f45010ab74516bbe1c3b384de60f9da3bf27 Mon Sep 17 00:00:00 2001
From: Lei Yu <jackqdyulei@google.com>
Date: Fri, 19 Apr 2019 13:36:31 -0700
Subject: [PATCH] Fix battery robo test

Fixes: 130896701
Test: RunSettingsRoboTests
Change-Id: Iffb7874250335db81181b23f96fe7b50a2dd0062
---
 src/com/android/settings/fuelgauge/BatteryMeterView.java       | 2 +-
 .../fuelgauge/BatteryHeaderPreferenceControllerTest.java       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

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);