Merge "Add NullPtrCheck when smearing in settings" into pi-dev (c2ec26b4) · Commits · e / os / android_packages_apps_Settings

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,11 @@ public class BatteryUtils {
		}

		if (totalActivityTimeMs >= 10 * DateUtils.MINUTE_IN_MILLIS) {
		if (screenSipper == null) {
		Log.e(TAG, "screen sipper is null even when app screen time is not zero");
		return;
		}

		final double screenPowerMah = screenSipper.totalPowerMah;
		for (int i = 0, size = sippers.size(); i < size; i++) {
		final BatterySipper sipper = sippers.get(i);

+12 −0

Original line number	Diff line number	Diff line
		@@ -376,6 +376,18 @@ public class BatteryUtilsTest {
		BATTERY_APP_USAGE + BATTERY_SCREEN_USAGE / 2);
		}

		@Test
		public void testSmearScreenBatterySipper_screenSipperNull_shouldNotCrash() {
		final BatterySipper sipperFg = createTestSmearBatterySipper(TIME_FOREGROUND,
		BATTERY_APP_USAGE, 2 /* uid /, false / isUidNull */);

		final List<BatterySipper> sippers = new ArrayList<>();
		sippers.add(sipperFg);

		// Shouldn't crash
		mBatteryUtils.smearScreenBatterySipper(sippers, null /* screenSipper */);
		}

		@Test
		public void testCalculateRunningTimeBasedOnStatsType() {
		assertThat(mBatteryUtils.calculateRunningTimeBasedOnStatsType(mBatteryStatsHelper,