diff options
| author | 2024-02-26 15:29:00 +0000 | |
|---|---|---|
| committer | 2024-02-26 15:29:00 +0000 | |
| commit | 0baf1490edfed9dbabdc078427a21461fb396d00 (patch) | |
| tree | 9fb39133ce7c3c6acbdb37e71e20511c96112f61 | |
| parent | 3836719dc046d6ee92263cc73cdde1d3da84f2da (diff) | |
| parent | 05c4854f1fff2be8d3ce1358cdbd698cb08eece8 (diff) | |
Merge "Reload pointer icons from the UiThread" into main
| -rw-r--r-- | services/core/java/com/android/server/input/InputManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index 32e89bcd1d21..dbef427e23a7 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -117,6 +117,7 @@ import com.android.internal.util.DumpUtils; import com.android.internal.util.Preconditions; import com.android.server.DisplayThread; import com.android.server.LocalServices; +import com.android.server.UiThread; import com.android.server.Watchdog; import com.android.server.input.InputManagerInternal.LidSwitchCallback; import com.android.server.input.debug.FocusEventDebugView; @@ -647,7 +648,7 @@ public class InputManagerService extends IInputManager.Stub final DisplayManager displayManager = Objects.requireNonNull( mContext.getSystemService(DisplayManager.class)); - displayManager.registerDisplayListener(mDisplayListener, mHandler); + displayManager.registerDisplayListener(mDisplayListener, UiThread.getHandler()); final Display[] displays = displayManager.getDisplays(); for (int i = 0; i < displays.length; i++) { mDisplayListener.onDisplayAdded(displays[i].getDisplayId()); @@ -3672,7 +3673,7 @@ public class InputManagerService extends IInputManager.Stub // Clear all cached icons on all displays. mLoadedPointerIconsByDisplayAndType.clear(); } - mNative.reloadPointerIcons(); + UiThread.getHandler().post(mNative::reloadPointerIcons); } interface KeyboardBacklightControllerInterface { |