Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev

2012-12-04 17:45:20 -08:00
parent 315557b015 e886adbda5
commit dd549bcc29
1 changed files with 5 additions and 1 deletions
--- 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 */