commit 8eec744ccb4b8e18ffaae7dbe089012539fffaac
author Ecco Park <eccopark@google.com> Fri Aug 04 16:21:59 2017 -0700
committer Ecco Park <eccopark@google.com> Mon Aug 07 16:51:12 2017 +0000
tree 4a272e2a9d6d55a7f227d5f5d3e93c194e281761
parent 35a563ef620cbbe6d4c17bfc649832014ae79c27

Location: adding NULL check for the LPP_PROFILE property

Bug: 35485906

Change-Id: I5e40be8ce0d3832f0e913bfe8fd9a38d87d0d28c
Signed-off-by: Ecco Park <eccopark@google.com>

services/core/java/com/android/server/location/GnssLocationProvider.java

diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index cdf25cf..11a4eb4 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 @@
                     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, "");