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

Commit ab4b27e0 authored by Vadim Caen's avatar Vadim Caen Committed by Android (Google) Code Review
Browse files

Merge "Fix callbacks not being unregistered from ProxyDispatcher" into tm-dev

parents a48dbac7 cb4c2a66

core/java/android/window/ProxyOnBackInvokedDispatcher.java

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ public class ProxyOnBackInvokedDispatcher implements OnBackInvokedDispatcher { 
        }

        synchronized (mLock) {

            mCallbacks.removeIf((p) -> p.first.equals(callback));

            if (mActualDispatcherOwner != null) {

                mActualDispatcherOwner.getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(

                        callback);

            }

        }

    }