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

Commit 8201bb3a authored by Arthur Hung's avatar Arthur Hung Committed by android-build-merger
Browse files

Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev 

am: 99d4417d

Change-Id: I99ad47e8e92f4831f6434e3952661849e55004c1
parents d272fe29 99d4417d

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

+6 −1
Original line number Diff line number Diff line
@@ -113,7 +113,12 @@ class SystemGesturesPointerEventListener implements PointerEventListener { 
        // statistics because it passes every touch event though a GestureDetector. By creating an

        // anonymous subclass of GestureDetector, these statistics will be recorded with a unique

        // source name that can be filtered.

        mGestureDetector = new GestureDetector(mContext, new FlingGestureDetector(), mHandler) {};



        // GestureDetector would get a ViewConfiguration instance by context, that may also

        // create a new WindowManagerImpl for the new display, and lock WindowManagerGlobal

        // temporarily in the constructor that would make a deadlock.

        mHandler.post(() -> mGestureDetector =

                new GestureDetector(mContext, new FlingGestureDetector(), mHandler) {});

    }



    @Override