Merge "Fix HDR blownout issue in the Photos app with HDR display on." into udc-dev (059a0275) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+3 −11

Original line number	Diff line number	Diff line
		@@ -5459,7 +5459,7 @@ public final class ViewRootImpl implements ViewParent,
		}

		private void updateRenderHdrSdrRatio() {
		mRenderHdrSdrRatio = mDisplay.getHdrSdrRatio();
		mRenderHdrSdrRatio = Math.min(mDesiredHdrSdrRatio, mDisplay.getHdrSdrRatio());
		mUpdateHdrSdrRatioInfo = true;
		}

		@@ -5487,22 +5487,14 @@ public final class ViewRootImpl implements ViewParent,
		mHdrSdrRatioChangedListener = null;
		} else {
		mHdrSdrRatioChangedListener = display -> {
		setTargetHdrSdrRatio(display.getHdrSdrRatio());
		updateRenderHdrSdrRatio();
		invalidate();
		};
		mDisplay.registerHdrSdrRatioChangedListener(mExecutor, mHdrSdrRatioChangedListener);
		}
		}
		}

		/** happylint */
		public void setTargetHdrSdrRatio(float ratio) {
		if (mRenderHdrSdrRatio != ratio) {
		mRenderHdrSdrRatio = ratio;
		mUpdateHdrSdrRatioInfo = true;
		invalidate();
		}
		}

		@Override
		public void requestChildFocus(View child, View focused) {
		if (DEBUG_INPUT_RESIZE) {