summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zheng Zhang <zhzh@google.com> 2017-10-16 10:27:28 -0700
committer Zheng Zhang <zhzh@google.com> 2017-10-23 20:32:42 +0000
commitad48bd9faf07f4d4ac9728b7005d995d463f9f08 (patch)
treec6b38422b6647d23ccc19d9bef2f6ac6a09cf55c
parent4a09e4c11e11fc6ce6d05970fe372bbee3d2c0f5 (diff)
GnssLocationProvider: modify "=" restriction to support URL with "=" inside
Bug: 67846626 Change-Id: I0a1f2de573bfd5e2043d6a24c91564817186074b
-rw-r--r--services/core/java/com/android/server/location/GnssLocationProvider.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index e41c17df8ca1..4cf35bc4accb 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -669,9 +669,11 @@ public class GnssLocationProvider implements LocationProviderInterface {
for (String item : configValues) {
if (DEBUG) Log.d(TAG, "GpsParamsResource: " + item);
// We need to support "KEY =", but not "=VALUE".
- String[] split = item.split("=");
- if (split.length == 2) {
- properties.setProperty(split[0].trim().toUpperCase(), split[1]);
+ int index = item.indexOf("=");
+ if (index > 0 && index + 1 < item.length()) {
+ String key = item.substring(0, index);
+ String value = item.substring(index + 1);
+ properties.setProperty(key.trim().toUpperCase(), value);
} else {
Log.w(TAG, "malformed contents: " + item);
}