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

Commit a4c52069 authored by Arthur Hung's avatar Arthur Hung
Browse files

Fix View#performHapticFeedback() can block UI thread 

Currently, IWindowSession#performHapticFeedback() would first lookup
the WindowState via IWindow token. That would also hold the WMS lock,
so if some function like relayout window is still hold WMS lock,
it may block the function.

Use uid and package name from Session that they already restored.

Bug: 62330939
Test: Open app with autofill edit, type with IME.
Change-Id: I359c106d213b87aa8afee48b0f1ad70011970eab
parent ddc0fa51

config/boot-image-profile.txt

+2 −2
Original line number Diff line number Diff line
@@ -32983,7 +32983,7 @@ HSPLandroid/view/IWindowSession$Stub$Proxy;->getDisplayFrame(Landroid/view/IWind 
HSPLandroid/view/IWindowSession$Stub$Proxy;->getInTouchMode()Z

HSPLandroid/view/IWindowSession$Stub$Proxy;->getWindowId(Landroid/os/IBinder;)Landroid/view/IWindowId;

HSPLandroid/view/IWindowSession$Stub$Proxy;->onRectangleOnScreenRequested(Landroid/os/IBinder;Landroid/graphics/Rect;)V

HSPLandroid/view/IWindowSession$Stub$Proxy;->performHapticFeedback(Landroid/view/IWindow;IZ)Z

HSPLandroid/view/IWindowSession$Stub$Proxy;->performHapticFeedback(IZ)Z

HSPLandroid/view/IWindowSession$Stub$Proxy;->pokeDrawLock(Landroid/os/IBinder;)V

HSPLandroid/view/IWindowSession$Stub$Proxy;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I

HSPLandroid/view/IWindowSession$Stub$Proxy;->remove(Landroid/view/IWindow;)V
@@ -33007,7 +33007,7 @@ HSPLandroid/view/IWindowSession;->getWindowId(Landroid/os/IBinder;)Landroid/view 
HSPLandroid/view/IWindowSession;->onRectangleOnScreenRequested(Landroid/os/IBinder;Landroid/graphics/Rect;)V

HSPLandroid/view/IWindowSession;->outOfMemory(Landroid/view/IWindow;)Z

HSPLandroid/view/IWindowSession;->performDrag(Landroid/view/IWindow;ILandroid/view/SurfaceControl;IFFFFLandroid/content/ClipData;)Landroid/os/IBinder;

HSPLandroid/view/IWindowSession;->performHapticFeedback(Landroid/view/IWindow;IZ)Z

HSPLandroid/view/IWindowSession;->performHapticFeedback(IZ)Z

HSPLandroid/view/IWindowSession;->pokeDrawLock(Landroid/os/IBinder;)V

HSPLandroid/view/IWindowSession;->prepareToReplaceWindows(Landroid/os/IBinder;Z)V

HSPLandroid/view/IWindowSession;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I

config/hiddenapi-greylist.txt

+1 −1
Original line number Diff line number Diff line
@@ -1524,7 +1524,7 @@ Landroid/view/IWindowSession$Stub;->asInterface(Landroid/os/IBinder;)Landroid/vi 
Landroid/view/IWindowSession;->finishDrawing(Landroid/view/IWindow;)V

Landroid/view/IWindowSession;->getInTouchMode()Z

Landroid/view/IWindowSession;->performDrag(Landroid/view/IWindow;ILandroid/view/SurfaceControl;IFFFFLandroid/content/ClipData;)Landroid/os/IBinder;

Landroid/view/IWindowSession;->performHapticFeedback(Landroid/view/IWindow;IZ)Z

Landroid/view/IWindowSession;->performHapticFeedback(IZ)Z

Landroid/view/IWindowSession;->remove(Landroid/view/IWindow;)V

Landroid/view/IWindowSession;->setInTouchMode(Z)V

Landroid/view/IWindowSession;->setTransparentRegion(Landroid/view/IWindow;Landroid/graphics/Region;)V

core/java/android/view/IWindowSession.aidl

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ interface IWindowSession { 
    void setInTouchMode(boolean showFocus);

    boolean getInTouchMode();



    boolean performHapticFeedback(IWindow window, int effectId, boolean always);

    boolean performHapticFeedback(int effectId, boolean always);



    /**

     * Initiate the drag operation itself

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -6996,7 +6996,7 @@ public final class ViewRootImpl implements ViewParent, 
    @Override

    public boolean performHapticFeedback(int effectId, boolean always) {

        try {

            return mWindowSession.performHapticFeedback(mWindow, effectId, always);

            return mWindowSession.performHapticFeedback(effectId, always);

        } catch (RemoteException e) {

            return false;

        }

services/art-profile

+3 −3
Original line number Diff line number Diff line
@@ -2942,7 +2942,7 @@ HSPLcom/android/server/policy/WindowManagerPolicy;->onConfigurationChanged()V 
HSPLcom/android/server/policy/WindowManagerPolicy;->onKeyguardOccludedChangedLw(Z)V

HSPLcom/android/server/policy/WindowManagerPolicy;->onLockTaskStateChangedLw(I)V

HSPLcom/android/server/policy/WindowManagerPolicy;->onSystemUiStarted()V

HSPLcom/android/server/policy/WindowManagerPolicy;->performHapticFeedbackLw(Lcom/android/server/policy/WindowManagerPolicy$WindowState;IZ)Z

HSPLcom/android/server/policy/WindowManagerPolicy;->performHapticFeedback(ILjava/lang/String;IZ)Z

HSPLcom/android/server/policy/WindowManagerPolicy;->prepareAddWindowLw(Lcom/android/server/policy/WindowManagerPolicy$WindowState;Landroid/view/WindowManager$LayoutParams;)I

HSPLcom/android/server/policy/WindowManagerPolicy;->registerShortcutKey(JLcom/android/internal/policy/IShortcutService;)V

HSPLcom/android/server/policy/WindowManagerPolicy;->removeWindowLw(Lcom/android/server/policy/WindowManagerPolicy$WindowState;)V
@@ -15736,7 +15736,7 @@ PLcom/android/server/policy/PhoneWindowManager;->onConfigurationChanged()V 
PLcom/android/server/policy/PhoneWindowManager;->onKeyguardOccludedChangedLw(Z)V

PLcom/android/server/policy/PhoneWindowManager;->onOverlayChangedLw()V

PLcom/android/server/policy/PhoneWindowManager;->onSystemUiStarted()V

PLcom/android/server/policy/PhoneWindowManager;->performHapticFeedbackLw(Lcom/android/server/policy/WindowManagerPolicy$WindowState;IZ)Z

PLcom/android/server/policy/PhoneWindowManager;->performHapticFeedback(ILjava/lang/String;IZ)Z

PLcom/android/server/policy/PhoneWindowManager;->powerPress(JZI)V

PLcom/android/server/policy/PhoneWindowManager;->prepareAddWindowLw(Lcom/android/server/policy/WindowManagerPolicy$WindowState;Landroid/view/WindowManager$LayoutParams;)I

PLcom/android/server/policy/PhoneWindowManager;->readCameraLensCoverState()V
@@ -18331,7 +18331,7 @@ PLcom/android/server/wm/Session;->getWindowId(Landroid/os/IBinder;)Landroid/view 
PLcom/android/server/wm/Session;->killSessionLocked()V

PLcom/android/server/wm/Session;->onRectangleOnScreenRequested(Landroid/os/IBinder;Landroid/graphics/Rect;)V

PLcom/android/server/wm/Session;->onWindowSurfaceVisibilityChanged(Lcom/android/server/wm/WindowSurfaceController;ZI)V

PLcom/android/server/wm/Session;->performHapticFeedback(Landroid/view/IWindow;IZ)Z

PLcom/android/server/wm/Session;->performHapticFeedback(IZ)Z

PLcom/android/server/wm/Session;->relayout(Landroid/view/IWindow;ILandroid/view/WindowManager$LayoutParams;IIIIJLandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/view/DisplayCutout$ParcelableWrapper;Landroid/util/MergedConfiguration;Landroid/view/Surface;)I

PLcom/android/server/wm/Session;->remove(Landroid/view/IWindow;)V

PLcom/android/server/wm/Session;->sendWallpaperCommand(Landroid/os/IBinder;Ljava/lang/String;IIILandroid/os/Bundle;Z)Landroid/os/Bundle;