Merge "Fix battery detail issues with "Android OS"" into mnc-dev (8bf5f307) · Commits · e / os / android_packages_apps_Settings

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -163,9 +163,11 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
		printWriter.flush();
		args.putString(PowerUsageDetail.EXTRA_REPORT_CHECKIN_DETAILS,
		result.toString());
		if (uid.getUid() != 0) {
		userId = UserHandle.getUserId(uid.getUid());
		}
		}
		}
		break;
		case CELL:
		{
		@@ -438,11 +440,11 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
		}
		});
		} else {
		removePreference(KEY_HIGH_POWER);
		mControlsParent.removePreference(findPreference(KEY_HIGH_POWER));
		}
		} else {
		removePreference(KEY_TWO_BUTTONS);
		removePreference(KEY_HIGH_POWER);
		mControlsParent.removePreference(findPreference(KEY_HIGH_POWER));
		}

		refreshStats();

+2 −0

Original line number	Diff line number	Diff line
		@@ -346,6 +346,8 @@ public class PowerUsageSummary extends PowerUsageBase {
		}
		stats.add(new BatterySipper(DrainType.APP,
		new FakeUid(Process.FIRST_APPLICATION_UID), use));
		stats.add(new BatterySipper(DrainType.APP,
		new FakeUid(0), use));

		// Simulate dex2oat process.
		BatterySipper sipper = new BatterySipper(DrainType.APP,