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

Commit cb4c2a66 authored by Vadim Caen's avatar Vadim Caen
Browse files

Fix callbacks not being unregistered from ProxyDispatcher 

Test: Manual
Bug: N/A
Change-Id: I1caae0fe212ca7915d6d689183e615e9c421dbfa
parent c099351d

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);

            }

        }

    }