diff options
| author | Wonsik Kim <wonsik@google.com> | 2014-07-31 17:50:45 +0900 |
|---|---|---|
| committer | Daniel Estrada Alva <destradaa@google.com> | 2014-07-31 18:24:23 +0000 |
| commit | c2b74b73a11b0a9aa4f29b28554292cc0947464b (patch) | |
| tree | a1e6092d563b4393752064f5c7314f63845aabdb /core/java | |
| parent | ad3aa32fee096f6887ba41bf0bf2b767cbdefeab (diff) | |
| download | frameworks_base-c2b74b73a11b0a9aa4f29b28554292cc0947464b.zip frameworks_base-c2b74b73a11b0a9aa4f29b28554292cc0947464b.tar.gz frameworks_base-c2b74b73a11b0a9aa4f29b28554292cc0947464b.tar.bz2 | |
Fix NPE when fused geofence hardware is not available.
b/16690237
Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/location/GeofenceHardwareImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/location/GeofenceHardwareImpl.java b/core/java/android/hardware/location/GeofenceHardwareImpl.java index 6734878..5c7a8da 100644 --- a/core/java/android/hardware/location/GeofenceHardwareImpl.java +++ b/core/java/android/hardware/location/GeofenceHardwareImpl.java @@ -139,8 +139,8 @@ public final class GeofenceHardwareImpl { private void updateFusedHardwareAvailability() { boolean fusedSupported; try { - fusedSupported = mFusedService.isSupported(); - } catch(RemoteException e) { + fusedSupported = (mFusedService != null ? mFusedService.isSupported() : false); + } catch (RemoteException e) { Log.e(TAG, "RemoteException calling LocationManagerService"); fusedSupported = false; } |