diff options
| author | 2023-08-18 09:05:13 +0000 | |
|---|---|---|
| committer | 2023-08-18 09:05:13 +0000 | |
| commit | bc3da03a01ddad7a2031dc55f99cc89eeba69b8e (patch) | |
| tree | b88c42cf833d229c7d08befde016416e6953f56a | |
| parent | f72516b9a7270d23b29583e169e3b705a4cb69a9 (diff) | |
| parent | d82149fe8f445293a17a0e3f7ef116c2dd6574af (diff) | |
Merge "skip load refresh rate profile if null" into udc-d1-dev am: d82149fe8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24404809
Change-Id: Ie5817cc5bbb211f9eb977eb978ddc52e0fcab08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/display/DisplayDeviceConfig.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index 7ccfb448cf61..2c67c433d06c 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -2056,7 +2056,7 @@ public class DisplayDeviceConfig { /** Loads the refresh rate profiles. */ private void loadRefreshRateZoneProfiles(RefreshRateConfigs refreshRateConfigs) { - if (refreshRateConfigs == null) { + if (refreshRateConfigs == null || refreshRateConfigs.getRefreshRateZoneProfiles() == null) { return; } for (RefreshRateZone zone : |