From e886adbda5b7cfbd563e5107bed1a72f5ec9952b Mon Sep 17 00:00:00 2001
From: Laurent Tu <laurentt@google.com>
Date: Tue, 4 Dec 2012 10:58:43 -0800
Subject: [PATCH] DO NOT MERGE Protect against NPE in FusionEngine.java.

Cherry-pick of Ic49a069eef47a62fb1e0c6f284a705a62c6ae232

Bug: 7629406
Change-Id: Ia04dba9496b02755678b43e12834e992f63ee45b
---
 .../src/com/android/location/fused/FusionEngine.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java b/packages/FusedLocation/src/com/android/location/fused/FusionEngine.java
index f137373a6dcec..f9091586b7fbb 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 */