Merge "Encapsulate BatterySipper and BatteryConsumer in BatteryEntry" into sc-dev

2021-03-17 16:57:42 +00:00
parent 99b3468b1c 656c67c01d
commit 60cc9e507b
6 changed files with 258 additions and 133 deletions
--- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
@@ -114,8 +114,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController
            final UserManager userManager =
                    (UserManager) mContext.getSystemService(Context.USER_SERVICE);
            final BatteryEntry entry = new BatteryEntry(mContext, null, userManager, mSipper,
-                    mUidBatteryConsumer);
-            entry.defaultPackageName = mPackageName;
+                    mUidBatteryConsumer, mPackageName);
            AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent,
                    mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry, mBatteryPercent);
        } else {