Merge "Use package from sipper if default is null" into oc-mr1-dev (6399937d) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/InstalledAppDetails.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1058,6 +1058,7 @@ public class InstalledAppDetails extends AppInfoBase
		} else if (preference == mBatteryPreference) {
		if (isBatteryStatsAvailable()) {
		BatteryEntry entry = new BatteryEntry(getContext(), null, mUserManager, mSipper);
		entry.defaultPackageName = mPackageName;
		AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(),
		this, mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry,
		mBatteryPercent, null /* mAnomalies */);

+4 −2

Original line number	Diff line number	Diff line
		@@ -137,7 +137,9 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
		args.putString(EXTRA_PACKAGE_NAME, null);
		} else {
		// populate data for normal app
		args.putString(EXTRA_PACKAGE_NAME, entry.defaultPackageName);
		args.putString(EXTRA_PACKAGE_NAME, entry.defaultPackageName != null
		? entry.defaultPackageName
		: sipper.mPackages[0]);
		}

		args.putInt(EXTRA_UID, sipper.getUid());

+12 −0

Original line number	Diff line number	Diff line
		@@ -368,6 +368,18 @@ public class AdvancedPowerUsageDetailTest {
		"0%");
		}

		@Test
		public void testStartBatteryDetailPage_defaultPackageNull_chooseFromBatterySipper() {
		mBatteryEntry.defaultPackageName = null;
		mBatteryEntry.sipper.mPackages = PACKAGE_NAME;

		AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, mBatteryUtils, null,
		mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT, null);

		assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
		PACKAGE_NAME[0]);
		}

		@Test
		public void testInitPreference_hasCorrectSummary() {
		Bundle bundle = new Bundle(4);