Merge "Add new method in PowerWhitelistBackend" into pi-dev (8003f88b) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/fuelgauge/PowerWhitelistBackend.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,19 @@ public class PowerWhitelistBackend {
		return mWhitelistedApps.contains(pkg);
		}

		public boolean isWhitelisted(String[] pkgs) {
		if (ArrayUtils.isEmpty(pkgs)) {
		return false;
		}
		for (String pkg : pkgs) {
		if (isWhitelisted(pkg)) {
		return true;
		}
		}

		return false;
		}

		public boolean isSysWhitelistedExceptIdle(String pkg) {
		return mSysWhitelistedAppsExceptIdle.contains(pkg);
		}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/fuelgauge/PowerWhitelistBackendTest.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -61,24 +61,32 @@ public class PowerWhitelistBackendTest {

		assertThat(mPowerWhitelistBackend.isWhitelisted(PACKAGE_ONE)).isTrue();
		assertThat(mPowerWhitelistBackend.isWhitelisted(PACKAGE_TWO)).isFalse();
		assertThat(mPowerWhitelistBackend.isWhitelisted(new String[]{PACKAGE_ONE})).isTrue();
		assertThat(mPowerWhitelistBackend.isWhitelisted(new String[]{PACKAGE_TWO})).isFalse();

		mPowerWhitelistBackend.addApp(PACKAGE_TWO);

		verify(mDeviceIdleService, atLeastOnce()).addPowerSaveWhitelistApp(PACKAGE_TWO);
		assertThat(mPowerWhitelistBackend.isWhitelisted(PACKAGE_ONE)).isTrue();
		assertThat(mPowerWhitelistBackend.isWhitelisted(PACKAGE_TWO)).isTrue();
		assertThat(mPowerWhitelistBackend.isWhitelisted(
		new String[]{PACKAGE_ONE, PACKAGE_TWO})).isTrue();

		mPowerWhitelistBackend.removeApp(PACKAGE_TWO);

		verify(mDeviceIdleService, atLeastOnce()).removePowerSaveWhitelistApp(PACKAGE_TWO);
		assertThat(mPowerWhitelistBackend.isWhitelisted(PACKAGE_ONE)).isTrue();
		assertThat(mPowerWhitelistBackend.isWhitelisted(PACKAGE_TWO)).isFalse();
		assertThat(mPowerWhitelistBackend.isWhitelisted(new String[]{PACKAGE_ONE})).isTrue();
		assertThat(mPowerWhitelistBackend.isWhitelisted(new String[]{PACKAGE_TWO})).isFalse();

		mPowerWhitelistBackend.removeApp(PACKAGE_ONE);

		verify(mDeviceIdleService, atLeastOnce()).removePowerSaveWhitelistApp(PACKAGE_ONE);
		assertThat(mPowerWhitelistBackend.isWhitelisted(PACKAGE_ONE)).isFalse();
		assertThat(mPowerWhitelistBackend.isWhitelisted(PACKAGE_TWO)).isFalse();
		assertThat(mPowerWhitelistBackend.isWhitelisted(
		new String[]{PACKAGE_ONE, PACKAGE_TWO})).isFalse();
		}

		@Test