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

Commit 50d4e335 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 am: e53542c1 

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



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

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

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

            final DisplayContent displayContent = mRoot.getDisplayContent(displayId);

            if (displayContent == null) {

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

                        + displayId + "}");

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

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

                        + "WindowRootContainer");

            }

            return displayContent.isInTouchMode();

        }