Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '4951482c4de1780a9103189aa4eff93b2e91c804':
  Skip receiver if failed linkToDeath to ILocationListener
This commit is contained in:
Mike Lockwood
2014-11-12 18:00:09 +00:00
committed by Android Git Automerger
parent 7be350d2cf 4951482c4d
commit ebc3d88380
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/LocationManagerService.java
View File

@@ -1452,14 +1452,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;
} }