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

Commit b29ecb4b authored by Antonio Kantek's avatar Antonio Kantek Committed by Automerger Merge Worker
Browse files

Merge "Improve error message in WMS#isInTouchMode" into udc-dev am: a69c3fe7... 

Merge "Improve error message in WMS#isInTouchMode" into udc-dev am: a69c3fe7 am: 0ea777dc am: b67bcfdf

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



Change-Id: I41cdffd7cf2293fbd9f65c4ab3f51b7b7a9a43e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9586aecc b67bcfdf

services/core/java/com/android/server/wm/WindowManagerService.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -3915,8 +3915,9 @@ public class WindowManagerService extends IWindowManager.Stub 
        synchronized (mGlobalLock) {

        synchronized (mGlobalLock) {

            final DisplayContent displayContent = mRoot.getDisplayContent(displayId);

            final DisplayContent displayContent = mRoot.getDisplayContent(displayId);

            if (displayContent == null) {

            if (displayContent == null) {

                throw new IllegalStateException("No touch mode is defined for displayId {"

                throw new IllegalStateException("Failed to retrieve the touch mode state for"

                        + displayId + "}");

                        + "display {" + displayId + "}: display is not registered in "

                        + "WindowRootContainer");

            }

            }

            return displayContent.isInTouchMode();

            return displayContent.isInTouchMode();

        }

        }