Merge "Skip receiver if failed linkToDeath to ILocationListener"

This commit is contained in:
Mike Lockwood
2014-11-12 17:50:19 +00:00
committed by Gerrit Code Review

View File

@@ -1450,14 +1450,13 @@ public class LocationManagerService extends ILocationManager.Stub {
if (receiver == null) { if (receiver == null) {
receiver = new Receiver(listener, null, pid, uid, packageName, workSource, receiver = new Receiver(listener, null, pid, uid, packageName, workSource,
hideFromAppOps); hideFromAppOps);
mReceivers.put(binder, receiver);
try { try {
receiver.getListener().asBinder().linkToDeath(receiver, 0); receiver.getListener().asBinder().linkToDeath(receiver, 0);
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(TAG, "linkToDeath failed:", e); Slog.e(TAG, "linkToDeath failed:", e);
return null; return null;
} }
mReceivers.put(binder, receiver);
} }
return receiver; return receiver;
} }