diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index cd2d36c60ade318b869b35b9387ef5c7211d7663..72d4cda8b139287cfdb20bb28fbafe13608723e8 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -2191,7 +2191,8 @@ public final class ViewRootImpl implements ViewParent, } else { mDisplay = preferredDisplay; } - if (mHdrSdrRatioChangedListener != null && mDisplay != null) { + if (mHdrSdrRatioChangedListener != null && mDisplay != null + && mDisplay.isHdrSdrRatioAvailable()) { mDisplay.registerHdrSdrRatioChangedListener(mExecutor, mHdrSdrRatioChangedListener); } mContext.updateDisplay(mDisplay.getDisplayId());