diff options
author | Long Ling <longling@google.com> | 2019-08-13 16:07:14 -0700 |
---|---|---|
committer | Long Ling <longling@google.com> | 2019-08-21 10:45:29 -0700 |
commit | 6f13f122134f8c866a74c769ac0c6a86cc79acae (patch) | |
tree | 8c585ff6ff084ec03dddf63c469567788e5d25e5 | |
parent | 67aae3f3226e41eb495ed2f73082daaeffa00e7c (diff) | |
download | base-6f13f122134f8c866a74c769ac0c6a86cc79acae.tar.gz |
DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager
high_refresh_rate_blacklist belongs to smooth display feature. Move the
key from namespace window_manager to display_manager.
Bug: 139138964
Test: atest WmTests:HighRefreshRateBlacklistTest
Test: Manual adb shell device_config/dumpsys window
Change-Id: I3ae8ecce80ef97c4683a1c18ad81dc78456e9d57
4 files changed, 20 insertions, 18 deletions
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index 21c49add6cba..5d8fa92263c4 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -855,5 +855,16 @@ public final class DisplayManager { * @hide */ String KEY_PEAK_REFRESH_RATE_DEFAULT = "peak_refresh_rate_default"; + + /** + * Key for controlling which packages are explicitly blocked from running at refresh rates + * higher than 60hz. An app may be added to this list if they exhibit performance issues at + * higher refresh rates. + * + * @see android.provider.DeviceConfig#NAMESPACE_DISPLAY_MANAGER + * @see android.R.array#config_highRefreshRateBlacklist + * @hide + */ + String KEY_HIGH_REFRESH_RATE_BLACKLIST = "high_refresh_rate_blacklist"; } } diff --git a/core/java/android/provider/DeviceConfig.java b/core/java/android/provider/DeviceConfig.java index c27576bacf96..c837b9346173 100644 --- a/core/java/android/provider/DeviceConfig.java +++ b/core/java/android/provider/DeviceConfig.java @@ -358,15 +358,6 @@ public final class DeviceConfig { */ String KEY_SYSTEM_GESTURE_EXCLUSION_LOG_DEBOUNCE_MILLIS = "system_gesture_exclusion_log_debounce_millis"; - - /** - * Key for controlling which packages are explicitly blocked from running at refresh rates - * higher than 60hz. - * - * @see android.provider.DeviceConfig#NAMESPACE_WINDOW_MANAGER - * @hide - */ - String KEY_HIGH_REFRESH_RATE_BLACKLIST = "high_refresh_rate_blacklist"; } private static final Object sLock = new Object(); diff --git a/services/core/java/com/android/server/wm/HighRefreshRateBlacklist.java b/services/core/java/com/android/server/wm/HighRefreshRateBlacklist.java index 5726cb2d87d4..b33b68a7a5b2 100644 --- a/services/core/java/com/android/server/wm/HighRefreshRateBlacklist.java +++ b/services/core/java/com/android/server/wm/HighRefreshRateBlacklist.java @@ -16,7 +16,7 @@ package com.android.server.wm; -import static android.provider.DeviceConfig.WindowManager.KEY_HIGH_REFRESH_RATE_BLACKLIST; +import static android.hardware.display.DisplayManager.DeviceConfig.KEY_HIGH_REFRESH_RATE_BLACKLIST; import android.annotation.NonNull; import android.annotation.Nullable; @@ -58,9 +58,9 @@ class HighRefreshRateBlacklist { @VisibleForTesting HighRefreshRateBlacklist(Resources r, DeviceConfigInterface deviceConfig) { mDefaultBlacklist = r.getStringArray(R.array.config_highRefreshRateBlacklist); - deviceConfig.addOnPropertyChangedListener(DeviceConfig.NAMESPACE_WINDOW_MANAGER, + deviceConfig.addOnPropertyChangedListener(DeviceConfig.NAMESPACE_DISPLAY_MANAGER, BackgroundThread.getExecutor(), new OnPropertyChangedListener()); - final String property = deviceConfig.getProperty(DeviceConfig.NAMESPACE_WINDOW_MANAGER, + final String property = deviceConfig.getProperty(DeviceConfig.NAMESPACE_DISPLAY_MANAGER, KEY_HIGH_REFRESH_RATE_BLACKLIST); updateBlacklist(property); } diff --git a/services/tests/wmtests/src/com/android/server/wm/HighRefreshRateBlacklistTest.java b/services/tests/wmtests/src/com/android/server/wm/HighRefreshRateBlacklistTest.java index e02b69c4b058..cd90462fffe4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/HighRefreshRateBlacklistTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/HighRefreshRateBlacklistTest.java @@ -16,7 +16,7 @@ package com.android.server.wm; -import static android.provider.DeviceConfig.WindowManager.KEY_HIGH_REFRESH_RATE_BLACKLIST; +import static android.hardware.display.DisplayManager.DeviceConfig.KEY_HIGH_REFRESH_RATE_BLACKLIST; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -126,9 +126,9 @@ public class HighRefreshRateBlacklistTest { @Override public String getProperty(String namespace, String name) { - if (!DeviceConfig.NAMESPACE_WINDOW_MANAGER.equals(namespace) + if (!DeviceConfig.NAMESPACE_DISPLAY_MANAGER.equals(namespace) || !KEY_HIGH_REFRESH_RATE_BLACKLIST.equals(name)) { - throw new IllegalArgumentException("Only things in NAMESPACE_WINDOW_MANAGER " + throw new IllegalArgumentException("Only things in NAMESPACE_DISPLAY_MANAGER " + "supported."); } return mBlacklist; @@ -138,8 +138,8 @@ public class HighRefreshRateBlacklistTest { public void addOnPropertyChangedListener(String namespace, Executor executor, DeviceConfig.OnPropertyChangedListener listener) { - if (!DeviceConfig.NAMESPACE_WINDOW_MANAGER.equals(namespace)) { - throw new IllegalArgumentException("Only things in NAMESPACE_WINDOW_MANAGER " + if (!DeviceConfig.NAMESPACE_DISPLAY_MANAGER.equals(namespace)) { + throw new IllegalArgumentException("Only things in NAMESPACE_DISPLAY_MANAGER " + "supported."); } mListeners.add(new Pair<>(listener, executor)); @@ -153,7 +153,7 @@ public class HighRefreshRateBlacklistTest { final Executor executor = listenerInfo.second; final DeviceConfig.OnPropertyChangedListener listener = listenerInfo.first; executor.execute(() -> { - listener.onPropertyChanged(DeviceConfig.NAMESPACE_WINDOW_MANAGER, + listener.onPropertyChanged(DeviceConfig.NAMESPACE_DISPLAY_MANAGER, KEY_HIGH_REFRESH_RATE_BLACKLIST, blacklist); latch.countDown(); }); |