Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7ecd6eb authored by jackqdyulei's avatar jackqdyulei Committed by android-build-merger
Browse files

Merge "Use default package in BatteryEntry" into oc-dev am: f5f51c4c am: 33cb1408 

am: 83bcc42e

Change-Id: I05b8dfbeb11a21617e77dbe3769f80a7a64d8097
parents fbd376b1 83bcc42e

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,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());

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

+1 −0
Original line number Diff line number Diff line
@@ -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);