From fb38259a0dd2d2628771fe8d90c541d9921cf2f1 Mon Sep 17 00:00:00 2001 From: "Wesley.CW Wang" Date: Thu, 24 Jun 2021 12:06:25 +0800 Subject: [PATCH] Update batteryDiffEntry filter condiction - Add condiction CONSUMER_TYPE_UID_BATTERY to avoid query system app data - Add default value for uid when entering AppInfo page Bug: 191734051 Test: make SettingsRoboTests Change-Id: I377e0d6aaa386dd5983eb71be1248f9859728cb9 --- .../appinfo/AppBatteryPreferenceController.java | 17 ++++++++++++++++- .../appinfo/AppInfoDashboardFragment.java | 5 ++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index d83f5d147dd..89c3478b4ef 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -43,6 +43,7 @@ import com.android.settings.fuelgauge.BatteryDiffEntry; import com.android.settings.fuelgauge.BatteryEntry; import com.android.settings.fuelgauge.BatteryUsageStatsLoader; import com.android.settings.fuelgauge.BatteryUtils; +import com.android.settings.fuelgauge.ConvertUtils; import com.android.settings.fuelgauge.PowerUsageFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -113,7 +114,13 @@ public class AppBatteryPreferenceController extends BasePreferenceController if (!KEY_BATTERY.equals(preference.getKey())) { return false; } + if (mBatteryDiffEntry != null) { + Log.i(TAG, "BatteryDiffEntry not null, launch : " + + mBatteryDiffEntry.getPackageName() + + " | uid : " + + mBatteryDiffEntry.mBatteryHistEntry.mUid + + " with DiffEntry data"); AdvancedPowerUsageDetail.startBatteryDetailPage( mParent.getActivity(), mParent, @@ -131,10 +138,16 @@ public class AppBatteryPreferenceController extends BasePreferenceController final BatteryEntry entry = new BatteryEntry(mContext, /* handler */null, userManager, mUidBatteryConsumer, /* isHidden */ false, mUidBatteryConsumer.getUid(), /* packages */ null, mPackageName); + Log.i(TAG, "Battery consumer available, launch : " + + entry.getDefaultPackageName() + + " | uid : " + + entry.getUid() + + " with BatteryEntry data"); AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent, entry, mIsChartGraphEnabled ? Utils.formatPercentage(0) : mBatteryPercent, !mIsChartGraphEnabled); } else { + Log.i(TAG, "Launch : " + mPackageName + " with package name"); AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent, mPackageName); } @@ -162,7 +175,9 @@ public class AppBatteryPreferenceController extends BasePreferenceController BatteryChartPreferenceController.getBatteryLast24HrUsageData(mContext); if (batteryDiffEntries != null) { for (BatteryDiffEntry batteryDiffEntry : batteryDiffEntries) { - if (batteryDiffEntry.mBatteryHistEntry.mUid == mUid) { + if (batteryDiffEntry.mBatteryHistEntry.mUid == mUid + && batteryDiffEntry.mBatteryHistEntry.mConsumerType + == ConvertUtils.CONSUMER_TYPE_UID_BATTERY) { return batteryDiffEntry; } } diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index 6d3aaa3c2c7..e1ea8e47afa 100755 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -582,9 +582,8 @@ public class AppInfoDashboardFragment extends DashboardFragment if (mUid <= 0) { final Intent intent = args == null ? getActivity().getIntent() : (Intent) args.getParcelable("intent"); - if (intent != null && intent.getExtras() != null) { - mUid = intent.getIntExtra("uId", -1); - } + mUid = intent != null && intent.getExtras() != null + ? mUid = intent.getIntExtra("uId", -1) : -1; } return mUid; }