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

Commit 6d3700b3 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 47235e8b: am 90cadb35: Merge "MountService listeners can not be unregistered" 

* commit '47235e8b':
  MountService listeners can not be unregistered
parents d0ec6d8c 47235e8b

services/java/com/android/server/MountService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1411,7 +1411,7 @@ class MountService extends IMountService.Stub 
    public void unregisterListener(IMountServiceListener listener) {

    public void unregisterListener(IMountServiceListener listener) {

        synchronized (mListeners) {

        synchronized (mListeners) {

            for(MountServiceBinderListener bl : mListeners) {

            for(MountServiceBinderListener bl : mListeners) {

                if (bl.mListener == listener) {

                if (bl.mListener.asBinder() == listener.asBinder()) {

                    mListeners.remove(mListeners.indexOf(bl));

                    mListeners.remove(mListeners.indexOf(bl));

                    listener.asBinder().unlinkToDeath(bl, 0);

                    listener.asBinder().unlinkToDeath(bl, 0);

                    return;

                    return;