diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-08 06:35:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-08 06:35:07 +0000 |
| commit | 9fb41faf14d1e994006fc8a3bd71ee63d08d56fe (patch) | |
| tree | 95112daa84fd522849709456f1b92443a43024de | |
| parent | d3b010c34f58709483954dc3385118319581c18a (diff) | |
| parent | 9ca162532e879ee8645ba8d4485f4b1badb8f73a (diff) | |
Merge "Check for null LOCATION_PROVIDERS_ALLOWED value"
| -rw-r--r-- | location/java/android/location/LocationManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index d3c6eddd02eb..d194796ec1c5 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -1271,6 +1271,9 @@ public class LocationManager { final String allowedProviders = Settings.Secure.getStringForUser( mContext.getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED, userHandle.getIdentifier()); + if (allowedProviders == null) { + return false; + } final List<String> providerList = Arrays.asList(allowedProviders.split(",")); for(String provider : getAllProviders()) { if (provider.equals(PASSIVE_PROVIDER)) { |