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

Commit 312e885d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "remove the wms lock in notifyMovementBoundsChanged method." into main... 

Merge "remove the wms lock in notifyMovementBoundsChanged method." into main am: 381625d9 am: b37f4af2

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



Change-Id: I7be9ebb1de4557fda34e31b4a539572732534692
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3834d23 b37f4af2

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

+16 −15
Original line number Diff line number Diff line
@@ -348,12 +348,14 @@ class PinnedTaskController { 
     * Notifies listeners that the PIP needs to be adjusted for the IME.

     */

    private void notifyImeVisibilityChanged(boolean imeVisible, int imeHeight) {

        if (mPinnedTaskListener != null) {

        if (mPinnedTaskListener == null) {

            return;

        }



        try {

            mPinnedTaskListener.onImeVisibilityChanged(imeVisible, imeHeight);

        } catch (RemoteException e) {

                Slog.e(TAG_WM, "Error delivering bounds changed event.", e);

            }

            Slog.e(TAG_WM, "Error delivering ime visibility changed event.", e);

        }

    }
@@ -361,15 +363,14 @@ class PinnedTaskController { 
     * Notifies listeners that the PIP movement bounds have changed.

     */

    private void notifyMovementBoundsChanged(boolean fromImeAdjustment) {

        synchronized (mService.mGlobalLock) {

        if (mPinnedTaskListener == null) {

            return;

        }



        try {

            mPinnedTaskListener.onMovementBoundsChanged(fromImeAdjustment);

        } catch (RemoteException e) {

                Slog.e(TAG_WM, "Error delivering actions changed event.", e);

            }

            Slog.e(TAG_WM, "Error delivering movement bounds changed event.", e);

        }

    }