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

automerge: ebc3d88

* commit 'ebc3d88380c6aa08ccae28c97d3b6374c20882e2':
  Skip receiver if failed linkToDeath to ILocationListener

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

@@ -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;
     }