diff options
Diffstat (limited to 'src/com/android/settings/fuelgauge')
3 files changed, 12 insertions, 6 deletions
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java index 3b1ea93..953ff3d 100644 --- a/src/com/android/settings/fuelgauge/BatteryStatsHelper.java +++ b/src/com/android/settings/fuelgauge/BatteryStatsHelper.java @@ -320,7 +320,12 @@ public class BatteryStatsHelper { R.string.details_title, null, null, 0); } - public void refreshStats() { + /** + * Refreshes the power usage list. + * @param includeZeroConsumption whether includes those applications which have consumed very + * little power up till now. + */ + public void refreshStats(boolean includeZeroConsumption) { // Initialize mStats if necessary. getStats(); @@ -336,7 +341,7 @@ public class BatteryStatsHelper { mUserSippers.clear(); mUserPower.clear(); - processAppUsage(); + processAppUsage(includeZeroConsumption); processMiscUsage(); Collections.sort(mUsageList); @@ -356,7 +361,7 @@ public class BatteryStatsHelper { } } - private void processAppUsage() { + private void processAppUsage(boolean includeZeroConsumption) { SensorManager sensorManager = (SensorManager) mActivity.getSystemService( Context.SENSOR_SERVICE); final int which = mStatsType; @@ -522,7 +527,7 @@ public class BatteryStatsHelper { // Add the app to the list if it is consuming power boolean isOtherUser = false; final int userId = UserHandle.getUserId(u.getUid()); - if (power != 0 || u.getUid() == 0) { + if (power != 0 || includeZeroConsumption || u.getUid() == 0) { BatterySipper app = new BatterySipper(mActivity, mRequestQueue, mHandler, packageWithHighestDrain, DrainType.APP, 0, u, new double[] {power}); diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java index e9b8106..ca159dc 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java @@ -36,6 +36,7 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; import android.os.Process; +import android.os.UserHandle; import android.preference.PreferenceActivity; import android.provider.Settings; import android.text.TextUtils; @@ -470,7 +471,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener Uri.fromParts("package", mPackages[0], null)); intent.putExtra(Intent.EXTRA_PACKAGES, mPackages); intent.putExtra(Intent.EXTRA_UID, mUid); - intent.putExtra(Intent.EXTRA_USER_HANDLE, mUid); + intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mUid)); getActivity().sendOrderedBroadcast(intent, null, mCheckKillProcessesReceiver, null, Activity.RESULT_CANCELED, null, null); } diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 480bb4e..740fdb5 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -210,7 +210,7 @@ public class PowerUsageSummary extends PreferenceFragment { addNotAvailableMessage(); return; } - mStatsHelper.refreshStats(); + mStatsHelper.refreshStats(false); List<BatterySipper> usageList = mStatsHelper.getUsageList(); for (BatterySipper sipper : usageList) { if (sipper.getSortValue() < MIN_POWER_THRESHOLD) continue; |