From 8eec744ccb4b8e18ffaae7dbe089012539fffaac Mon Sep 17 00:00:00 2001
From: Ecco Park <eccopark@google.com>
Date: Fri, 4 Aug 2017 16:21:59 -0700
Subject: [PATCH] Location: adding NULL check for the LPP_PROFILE property

Bug: 35485906

Change-Id: I5e40be8ce0d3832f0e913bfe8fd9a38d87d0d28c
Signed-off-by: Ecco Park <eccopark@google.com>
---
 .../com/android/server/location/GnssLocationProvider.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index cdf25cfe65f6c..11a4eb48f64d3 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -543,7 +543,9 @@ public class GnssLocationProvider implements LocationProviderInterface {
                     loadPropertiesFromResource(context, mProperties);
                     String lpp_profile = mProperties.getProperty("LPP_PROFILE");
                     // set the persist property LPP_PROFILE for the value
-                    SystemProperties.set(LPP_PROFILE, lpp_profile);
+                    if (lpp_profile != null) {
+                        SystemProperties.set(LPP_PROFILE, lpp_profile);
+                    }
                 } else {
                     // reset the persist property
                     SystemProperties.set(LPP_PROFILE, "");