Merge "Return the default touch mode for dead displays" into udc-dev am: 7b8a655a8b

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

Change-Id: I475a476ee9a85675a11e2c397d663d0eeb725c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Antonio Kantek
2023-05-09 00:30:00 +00:00
committed by Automerger Merge Worker

View File

@@ -3922,15 +3922,17 @@ public class WindowManagerService extends IWindowManager.Stub
/**
* Returns the touch mode state for the display id passed as argument.
*
* This method will return the default touch mode state (represented by
* {@code com.android.internal.R.bool.config_defaultInTouchMode}) if the display passed as
* argument is no longer registered in {@RootWindowContainer}).
*/
@Override // Binder call
public boolean isInTouchMode(int displayId) {
synchronized (mGlobalLock) {
final DisplayContent displayContent = mRoot.getDisplayContent(displayId);
if (displayContent == null) {
throw new IllegalStateException("Failed to retrieve the touch mode state for"
+ "display {" + displayId + "}: display is not registered in "
+ "WindowRootContainer");
return mContext.getResources().getBoolean(R.bool.config_defaultInTouchMode);
}
return displayContent.isInTouchMode();
}