From 388e968a08b080d696de7ea6e477fb674583ed0a Mon Sep 17 00:00:00 2001
From: Hridya Valsaraju <hridya@google.com>
Date: Wed, 8 Mar 2017 10:57:06 -0800
Subject: [PATCH] Fix bug in error checking in GnssLocationProvider

Needed to check if gnssNiIface was a nullptr
before calling setCallback on it.

Bug: 36052760
Test: make
Change-Id: I4d725bd30310353fb7d248f9bf247ac55f94c765
---
 .../jni/com_android_server_location_GnssLocationProvider.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index 36ae94b88b232..78d8b53bee755 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
@@ -1175,7 +1175,7 @@ static jboolean android_location_GnssLocationProvider_init(JNIEnv* env, jobject
     }
 
     sp<IGnssNiCallback> gnssNiCbIface = new GnssNiCallback();
-    if (gnssNiCbIface != nullptr) {
+    if (gnssNiIface != nullptr) {
         gnssNiIface->setCallback(gnssNiCbIface);
     } else {
         ALOGE("Unable to initialize GNSS NI interface\n");