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

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

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

am: f5f51c4c

Change-Id: Ifd36cd50e2f4528dae247e99aafb5e93d916351e
parents 08bdbf3d f5f51c4c

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

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

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

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