Merge "Remove unused code." (9d053095) · Commits · e / os / android_frameworks_base

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

+0 −24

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ public class PowerWhitelistBackend {
		private final IDeviceIdleController mDeviceIdleService;
		private final ArraySet<String> mWhitelistedApps = new ArraySet<>();
		private final ArraySet<String> mSysWhitelistedApps = new ArraySet<>();
		private final ArraySet<String> mSysWhitelistedAppsExceptIdle = new ArraySet<>();
		private final ArraySet<String> mDefaultActiveApps = new ArraySet<>();

		public PowerWhitelistBackend(Context context) {
		@@ -117,23 +116,6 @@ public class PowerWhitelistBackend {
		return false;
		}

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

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

		return false;
		}

		public void addApp(String pkg) {
		try {
		mDeviceIdleService.addPowerSaveWhitelistApp(pkg);
		@@ -155,7 +137,6 @@ public class PowerWhitelistBackend {
		@VisibleForTesting
		public void refreshList() {
		mSysWhitelistedApps.clear();
		mSysWhitelistedAppsExceptIdle.clear();
		mWhitelistedApps.clear();
		mDefaultActiveApps.clear();
		if (mDeviceIdleService == null) {
		@@ -170,11 +151,6 @@ public class PowerWhitelistBackend {
		for (String app : sysWhitelistedApps) {
		mSysWhitelistedApps.add(app);
		}
		final String[] sysWhitelistedAppsExceptIdle =
		mDeviceIdleService.getSystemPowerWhitelistExceptIdle();
		for (String app : sysWhitelistedAppsExceptIdle) {
		mSysWhitelistedAppsExceptIdle.add(app);
		}
		final boolean hasTelephony = mAppContext.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_TELEPHONY);
		final ComponentName defaultSms = SmsApplication.getDefaultSmsApplication(mAppContext,

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

+0 −23

Original line number	Diff line number	Diff line
		@@ -151,27 +151,4 @@ public class PowerWhitelistBackendTest {
		assertThat(mPowerWhitelistBackend.isSysWhitelisted(PACKAGE_TWO)).isFalse();
		assertThat(mPowerWhitelistBackend.isWhitelisted(PACKAGE_ONE)).isFalse();
		}

		@Test
		public void testIsSystemWhitelistedExceptIdle_onePackage() throws Exception {
		doReturn(new String[] {PACKAGE_TWO}).when(
		mDeviceIdleService).getSystemPowerWhitelistExceptIdle();
		mPowerWhitelistBackend.refreshList();

		assertThat(mPowerWhitelistBackend.isSysWhitelistedExceptIdle(PACKAGE_ONE)).isFalse();
		assertThat(mPowerWhitelistBackend.isSysWhitelistedExceptIdle(PACKAGE_TWO)).isTrue();
		}

		@Test
		public void testIsSystemWhitelistedExceptIdle_packageArray() throws Exception {
		doReturn(new String[] {PACKAGE_TWO}).when(
		mDeviceIdleService).getSystemPowerWhitelistExceptIdle();
		mPowerWhitelistBackend.refreshList();

		final String[] idlePackages = {PACKAGE_ONE, PACKAGE_TWO};
		final String[] normalPackages = {PACKAGE_ONE};

		assertThat(mPowerWhitelistBackend.isSysWhitelistedExceptIdle(normalPackages)).isFalse();
		assertThat(mPowerWhitelistBackend.isSysWhitelistedExceptIdle(idlePackages)).isTrue();
		}
		}