Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return the default touch mode for dead displays" into udc-dev

Browse Source
This commit is contained in:
Antonio Kantek
2023-05-08 18:03:45 +00:00
committed by Android (Google) Code Review
parent c0a3c23ac0 a6b481a7d2
commit 7b8a655a8b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -3922,15 +3922,17 @@ public class WindowManagerService extends IWindowManager.Stub
/** /**
* Returns the touch mode state for the display id passed as argument. * 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 @Override // Binder call
public boolean isInTouchMode(int displayId) { public boolean isInTouchMode(int displayId) {
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("Failed to retrieve the touch mode state for" return mContext.getResources().getBoolean(R.bool.config_defaultInTouchMode);
+ "display {" + displayId + "}: display is not registered in "
+ "WindowRootContainer");
} }
return displayContent.isInTouchMode(); return displayContent.isInTouchMode();
} }