summaryrefslogtreecommitdiffstats
path: root/packages/FusedLocation
diff options
context:
space:
mode:
authorLaurent Tu <laurentt@google.com>2012-12-04 10:58:43 -0800
committerLaurent Tu <laurentt@google.com>2012-12-04 10:58:43 -0800
commit161f42619b82995f88f6e299b6c74cb8382c4135 (patch)
tree89cf43ff5469c18c047c90d8d69c5fbf9b7ef384 /packages/FusedLocation
parent2c5f782094c5668a9615e2f9f41063386ae52b28 (diff)
downloadframeworks_base-161f42619b82995f88f6e299b6c74cb8382c4135.zip
frameworks_base-161f42619b82995f88f6e299b6c74cb8382c4135.tar.gz
frameworks_base-161f42619b82995f88f6e299b6c74cb8382c4135.tar.bz2
Protect against NPE in FusionEngine.java.
Bug: 7629406 Change-Id: Ic49a069eef47a62fb1e0c6f284a705a62c6ae232
Diffstat (limited to 'packages/FusedLocation')
-rw-r--r--packages/FusedLocation/src/com/android/location/fused/FusionEngine.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java b/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
index f137373..f909158 100644
--- a/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
+++ b/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
@@ -249,7 +249,11 @@ public class FusionEngine implements LocationListener {
}
}
- mCallback.reportLocation(mFusedLocation);
+ if (mCallback != null) {
+ mCallback.reportLocation(mFusedLocation);
+ } else {
+ Log.w(TAG, "Location updates received while fusion engine not started");
+ }
}
/** Called on mLooper thread */