PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 83bcc42e77

Change-Id: I05b8dfbeb11a21617e77dbe3769f80a7a64d8097
This commit is contained in:
jackqdyulei
2017-06-08 02:19:10 +00:00
committed by android-build-merger
parent fbd376b1ba 83bcc42e77
commit c7ecd6ebff
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -122,7 +122,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
args.putString(EXTRA_PACKAGE_NAME, null); args.putString(EXTRA_PACKAGE_NAME, null);
} else { } else {
// populate data for normal app // 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()); args.putInt(EXTRA_UID, sipper.getUid());

1
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
View File

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