Merge "Add util method to get battery stats" into oc-dr1-dev

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

@@ -41,9 +41,12 @@ public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
 
     @Override
     public BatteryStatsHelper loadInBackground() {
-        final BatteryStatsHelper statsHelper = new BatteryStatsHelper(getContext(), true);
+        Context context = getContext();
+        final BatteryStatsHelper statsHelper = new BatteryStatsHelper(context,
+                true /* collectBatteryBroadcast */);
 
-        initBatteryStatsHelper(statsHelper);
+        BatteryUtils.getInstance(context).initBatteryStatsHelper(statsHelper, mBundle,
+                mUserManager);
         return statsHelper;
     }
 
@@ -52,9 +55,5 @@ public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
 
     }
 
-    @VisibleForTesting
+
-    void initBatteryStatsHelper(BatteryStatsHelper statsHelper) {
-        statsHelper.create(mBundle);
-        statsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, mUserManager.getUserProfiles());
-    }
 }

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

@@ -18,7 +18,9 @@ package com.android.settings.fuelgauge;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.BatteryStats;
+import android.os.Bundle;
 import android.os.SystemClock;
+import android.os.UserManager;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
@@ -328,6 +330,12 @@ public class BatteryUtils {
         return timeMs * 1000;
     }
 
+    public void initBatteryStatsHelper(BatteryStatsHelper statsHelper, Bundle bundle,
+            UserManager userManager) {
+        statsHelper.create(bundle);
+        statsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, userManager.getUserProfiles());
+    }
+
     private boolean isDataCorrupted() {
         return mPackageManager == null;
     }

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

@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.os.BatteryStats;
-import android.os.Bundle;
-import android.os.UserManager;
-
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class BatteryStatsHelperLoaderTest {
-    @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private Bundle mBundle;
-    @Mock
-    private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-    private BatteryStatsHelperLoader mLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mLoader = new BatteryStatsHelperLoader(mContext, mBundle);
-        mLoader.mUserManager = mUserManager;
-    }
-
-    @Test
-    public void testInitBatteryStatsHelper_init() {
-        mLoader.initBatteryStatsHelper(mBatteryStatsHelper);
-
-        verify(mBatteryStatsHelper).create(mBundle);
-        verify(mBatteryStatsHelper).refreshStats(BatteryStats.STATS_SINCE_CHARGED,
-                mUserManager.getUserProfiles());
-    }
-}

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

@@ -17,8 +17,10 @@ package com.android.settings.fuelgauge;
 
 import android.content.Context;
 import android.os.BatteryStats;
+import android.os.Bundle;
 import android.os.Process;
 import android.os.SystemClock;
+import android.os.UserManager;
 import android.text.format.DateUtils;
 
 import com.android.internal.os.BatterySipper;
@@ -57,6 +59,7 @@ import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.spy;
 
@@ -116,6 +119,10 @@ public class BatteryUtilsTest {
     private BatterySipper mCellBatterySipper;
     @Mock
     private BatterySipper mIdleBatterySipper;
+    @Mock
+    private Bundle mBundle;
+    @Mock
+    private UserManager mUserManager;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -401,4 +408,13 @@ public class BatteryUtilsTest {
 
         return sipper;
     }
+
+    @Test
+    public void testInitBatteryStatsHelper_init() {
+        mBatteryUtils.initBatteryStatsHelper(mBatteryStatsHelper, mBundle, mUserManager);
+
+        verify(mBatteryStatsHelper).create(mBundle);
+        verify(mBatteryStatsHelper).refreshStats(BatteryStats.STATS_SINCE_CHARGED,
+                mUserManager.getUserProfiles());
+    }
 }