Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4cf2

am: 33cb1408e2

Change-Id: I98d07e6a1194d71c9a2baaaf8ae08f159ff03a76

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

@@ -269,6 +269,7 @@ public class AdvancedPowerUsageDetailTest {
     @Test
     public void testStartBatteryDetailPage_NormalApp() {
         mBatterySipper.mPackages = PACKAGE_NAME;
+        mBatteryEntry.defaultPackageName = PACKAGE_NAME[0];
         AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
                 mBatteryEntry, USAGE_PERCENT);