summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ecco Park <eccopark@google.com> 2017-08-07 17:18:55 +0000
committer android-build-merger <android-build-merger@google.com> 2017-08-07 17:18:55 +0000
commitfe7865b10d0e7fd02885bba263444c74e992d1bc (patch)
tree7ab8ec3f29981f17146660b4e763709aaf9fab7f
parentb901f055b5796bd7d8f916c5783bb8cf4e096266 (diff)
parent8eec744ccb4b8e18ffaae7dbe089012539fffaac (diff)
Location: adding NULL check for the LPP_PROFILE property
am: 8eec744ccb Change-Id: Ia72f80b5d809190c7e2f733c8e59bf989f826973
-rw-r--r--services/core/java/com/android/server/location/GnssLocationProvider.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index cdf25cfe65f6..11a4eb48f64d 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, "");