From 116fec5b258887bd0f7fb115526dbd88b95f10fd Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Mon, 10 Jul 2017 11:00:05 -0700 Subject: [PATCH] Init BatteryUtils in constructor In this case we won't have the NPE. Bug: 63526637 Test: RunSettingsRoboTests Change-Id: I20375e535ba07deddacf74052f31476e0cb28e56 --- .../fuelgauge/anomaly/action/BackgroundCheckAction.java | 1 + .../anomaly/action/BackgroundCheckActionTest.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java index 5526cc903b3..aa3fc39f442 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java @@ -38,6 +38,7 @@ public class BackgroundCheckAction extends AnomalyAction { super(context); mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); mActionMetricKey = MetricsProto.MetricsEvent.ACTION_APP_BACKGROUND_CHECK; + mBatteryUtils = BatteryUtils.getInstance(context); } @Override diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java index e2b8656c5cf..7e5fc4ac817 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java @@ -94,4 +94,11 @@ public class BackgroundCheckActionTest { assertThat(mBackgroundCheckAction.isActionActive(mAnomaly)).isFalse(); } + + @Test + public void testConstructor_batteryUtilsNotNull() { + mBackgroundCheckAction = new BackgroundCheckAction(mContext); + + assertThat(mBackgroundCheckAction.mBatteryUtils).isNotNull(); + } }