am e0dda90b: am aa64548d: Merge "Fixed unreleased wake lock isues and NPE." into jb-mr2-dev

* commit 'e0dda90bde531b12dda8ce0909040b070c3b2b84':
  Fixed unreleased wake lock isues and NPE.

1 files changed, 40 insertions, 34 deletions

diff --git a/core/java/android/hardware/location/GeofenceHardwareImpl.java b/core/java/android/hardware/location/GeofenceHardwareImpl.java
index e3362a7..9823c49 100644
--- a/core/java/android/hardware/location/GeofenceHardwareImpl.java
+++ b/core/java/android/hardware/location/GeofenceHardwareImpl.java
@@ -470,11 +470,12 @@ public final class GeofenceHardwareImpl {
                     synchronized (mGeofences) {
                         callback = mGeofences.get(geofenceId);
                     }
-                    if (callback == null) return;
 
-                    try {
-                        callback.onGeofenceAdd(geofenceId, msg.arg2);
-                    } catch (RemoteException e) {Log.i(TAG, "Remote Exception:" + e);}
+                    if (callback != null) {
+                        try {
+                            callback.onGeofenceAdd(geofenceId, msg.arg2);
+                        } catch (RemoteException e) {Log.i(TAG, "Remote Exception:" + e);}
+                    }
                     releaseWakeLock();
                     break;
                 case REMOVE_GEOFENCE_CALLBACK:
@@ -482,13 +483,14 @@ public final class GeofenceHardwareImpl {
                     synchronized (mGeofences) {
                         callback = mGeofences.get(geofenceId);
                     }
-                    if (callback == null) return;
 
-                    try {
-                        callback.onGeofenceRemove(geofenceId, msg.arg2);
-                    } catch (RemoteException e) {}
-                    synchronized (mGeofences) {
-                        mGeofences.remove(geofenceId);
+                    if (callback != null) {
+                        try {
+                            callback.onGeofenceRemove(geofenceId, msg.arg2);
+                        } catch (RemoteException e) {}
+                        synchronized (mGeofences) {
+                            mGeofences.remove(geofenceId);
+                        }
                     }
                     releaseWakeLock();
                     break;
@@ -498,11 +500,12 @@ public final class GeofenceHardwareImpl {
                     synchronized (mGeofences) {
                         callback = mGeofences.get(geofenceId);
                     }
-                    if (callback == null) return;
 
-                    try {
-                        callback.onGeofencePause(geofenceId, msg.arg2);
-                    } catch (RemoteException e) {}
+                    if (callback != null) {
+                        try {
+                            callback.onGeofencePause(geofenceId, msg.arg2);
+                        } catch (RemoteException e) {}
+                    }
                     releaseWakeLock();
                     break;
 
@@ -511,11 +514,12 @@ public final class GeofenceHardwareImpl {
                     synchronized (mGeofences) {
                         callback = mGeofences.get(geofenceId);
                     }
-                    if (callback == null) return;
 
-                    try {
-                        callback.onGeofenceResume(geofenceId, msg.arg2);
-                    } catch (RemoteException e) {}
+                    if (callback != null) {
+                        try {
+                            callback.onGeofenceResume(geofenceId, msg.arg2);
+                        } catch (RemoteException e) {}
+                    }
                     releaseWakeLock();
                     break;
 
@@ -530,12 +534,14 @@ public final class GeofenceHardwareImpl {
                             " Transition: " + geofenceTransition.mTransition +
                             " Location: " + geofenceTransition.mLocation + ":" + mGeofences);
 
-                    try {
-                        callback.onGeofenceTransition(
-                                geofenceTransition.mGeofenceId, geofenceTransition.mTransition,
-                                geofenceTransition.mLocation, geofenceTransition.mTimestamp,
-                                GeofenceHardware.MONITORING_TYPE_GPS_HARDWARE);
-                    } catch (RemoteException e) {}
+                    if (callback != null) {
+                        try {
+                            callback.onGeofenceTransition(
+                                    geofenceTransition.mGeofenceId, geofenceTransition.mTransition,
+                                    geofenceTransition.mLocation, geofenceTransition.mTimestamp,
+                                    GeofenceHardware.MONITORING_TYPE_GPS_HARDWARE);
+                        } catch (RemoteException e) {}
+                    }
                     releaseWakeLock();
                     break;
                 case GEOFENCE_CALLBACK_BINDER_DIED:
@@ -572,16 +578,16 @@ public final class GeofenceHardwareImpl {
                     available = (val == GeofenceHardware.MONITOR_CURRENTLY_AVAILABLE ?
                             true : false);
                     callbackList = mCallbacks[GeofenceHardware.MONITORING_TYPE_GPS_HARDWARE];
-                    if (callbackList == null) return;
-
-                    if (DEBUG) Log.d(TAG, "MonitoringSystemChangeCallback: GPS : " + available);
-
-                    for (IGeofenceHardwareMonitorCallback c: callbackList) {
-                        try {
-                            c.onMonitoringSystemChange(
-                                    GeofenceHardware.MONITORING_TYPE_GPS_HARDWARE, available,
-                                    location);
-                        } catch (RemoteException e) {}
+                    if (callbackList != null) {
+                        if (DEBUG) Log.d(TAG, "MonitoringSystemChangeCallback: GPS : " + available);
+
+                        for (IGeofenceHardwareMonitorCallback c: callbackList) {
+                            try {
+                                c.onMonitoringSystemChange(
+                                        GeofenceHardware.MONITORING_TYPE_GPS_HARDWARE, available,
+                                        location);
+                            } catch (RemoteException e) {}
+                        }
                     }
                     releaseWakeLock();
                     break;