Merge "Only apply flag when it has been changed" (526acdc9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/HighRefreshRateBlacklist.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -105,9 +105,11 @@ class HighRefreshRateBlacklist {

		private class OnPropertiesChangedListener implements DeviceConfig.OnPropertiesChangedListener {
		public void onPropertiesChanged(@NonNull DeviceConfig.Properties properties) {
		if (properties.getKeyset().contains(KEY_HIGH_REFRESH_RATE_BLACKLIST)) {
		updateBlacklist(
		properties.getString(KEY_HIGH_REFRESH_RATE_BLACKLIST, null /default/));
		}
		}
		}
		}

+17 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,23 @@ public class HighRefreshRateBlacklistTest {
		assertFalse(mBlacklist.isBlacklisted(APP3));
		}

		@Test
		public void testOverriddenByDeviceConfigUnrelatedFlagChanged() {
		final Resources r = createResources(APP1);
		final FakeDeviceConfig config = new FakeDeviceConfig();
		mBlacklist = new HighRefreshRateBlacklist(r, config);
		config.setBlacklist(APP2 + "," + APP3);
		assertFalse(mBlacklist.isBlacklisted(APP1));
		assertTrue(mBlacklist.isBlacklisted(APP2));
		assertTrue(mBlacklist.isBlacklisted(APP3));

		// Change an unrelated flag in our namespace and verify that the blacklist is intact
		config.putPropertyAndNotify(DeviceConfig.NAMESPACE_DISPLAY_MANAGER, "someKey", "someValue");
		assertFalse(mBlacklist.isBlacklisted(APP1));
		assertTrue(mBlacklist.isBlacklisted(APP2));
		assertTrue(mBlacklist.isBlacklisted(APP3));
		}

		private Resources createResources(String... defaultBlacklist) {
		Resources r = mock(Resources.class);
		when(r.getStringArray(R.array.config_highRefreshRateBlacklist))