| commit | e886adbda5b7cfbd563e5107bed1a72f5ec9952b | [log] [tgz] |
|---|---|---|
| author | Laurent Tu <laurentt@google.com> | Tue Dec 04 10:58:43 2012 -0800 |
| committer | Laurent Tu <laurentt@google.com> | Tue Dec 04 16:15:24 2012 -0800 |
| tree | ff86e36faccd6d694df7e4012a6e10941deb40d0 | |
| parent | 82a76800ad78b7aa6e2bde2f6512e4ffbe21873f [diff] |
DO NOT MERGE Protect against NPE in FusionEngine.java. Cherry-pick of Ic49a069eef47a62fb1e0c6f284a705a62c6ae232 Bug: 7629406 Change-Id: Ia04dba9496b02755678b43e12834e992f63ee45b
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 @@ } } - 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 */