Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bb1b75a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash issue when gallery app with Ultra HDR photo is moved to the... 

Merge "Fix crash issue when gallery app with Ultra HDR photo is moved to the virtual display." into main am: b043595d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2906121



Change-Id: Ie9dbffc8ff0ffb6bfe25c84a1fe6da9e3a128a40
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a70f0500 b043595d

core/java/android/view/ViewRootImpl.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -2191,7 +2191,8 @@ public final class ViewRootImpl implements ViewParent, 
        } else {

        } else {

            mDisplay = preferredDisplay;

            mDisplay = preferredDisplay;

        }

        }

        if (mHdrSdrRatioChangedListener != null && mDisplay != null) {

        if (mHdrSdrRatioChangedListener != null && mDisplay != null

                && mDisplay.isHdrSdrRatioAvailable()) {

            mDisplay.registerHdrSdrRatioChangedListener(mExecutor, mHdrSdrRatioChangedListener);

            mDisplay.registerHdrSdrRatioChangedListener(mExecutor, mHdrSdrRatioChangedListener);

        }

        }

        mContext.updateDisplay(mDisplay.getDisplayId());

        mContext.updateDisplay(mDisplay.getDisplayId());