Merge "Use default package in BatteryEntry" into oc-dev

This commit is contained in:
TreeHugger Robot
2017-06-08 02:10:28 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 1 deletions

View File

@@ -119,7 +119,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
args.putString(EXTRA_PACKAGE_NAME, null);
} else {
// populate data for normal app
args.putString(EXTRA_PACKAGE_NAME, sipper.mPackages[0]);
args.putString(EXTRA_PACKAGE_NAME, entry.defaultPackageName);
}
args.putInt(EXTRA_UID, sipper.getUid());

View File

@@ -248,6 +248,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);