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

Commit 083450a4 authored by Mike Lockwood's avatar Mike Lockwood Committed by android-build-merger
Browse files

am 4951482c: Merge "Skip receiver if failed linkToDeath to ILocationListener" 

automerge: ebc3d883

* commit 'ebc3d883':
  Skip receiver if failed linkToDeath to ILocationListener
parents 586c3678 ebc3d883

services/core/java/com/android/server/LocationManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -1452,14 +1452,13 @@ public class LocationManagerService extends ILocationManager.Stub { 
        if (receiver == null) {

            receiver = new Receiver(listener, null, pid, uid, packageName, workSource,

                    hideFromAppOps);

            mReceivers.put(binder, receiver);



            try {

                receiver.getListener().asBinder().linkToDeath(receiver, 0);

            } catch (RemoteException e) {

                Slog.e(TAG, "linkToDeath failed:", e);

                return null;

            }

            mReceivers.put(binder, receiver);

        }

        return receiver;

    }