Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fb41faf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check for null LOCATION_PROVIDERS_ALLOWED value"

parents d3b010c3 9ca16253

location/java/android/location/LocationManager.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -1271,6 +1271,9 @@ public class LocationManager { 
        final String allowedProviders = Settings.Secure.getStringForUser(

        final String allowedProviders = Settings.Secure.getStringForUser(

                mContext.getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED,

                mContext.getContentResolver(), Settings.Secure.LOCATION_PROVIDERS_ALLOWED,

                userHandle.getIdentifier());

                userHandle.getIdentifier());

        if (allowedProviders == null) {

            return false;

        }

        final List<String> providerList = Arrays.asList(allowedProviders.split(","));

        final List<String> providerList = Arrays.asList(allowedProviders.split(","));

        for(String provider : getAllProviders()) {

        for(String provider : getAllProviders()) {

            if (provider.equals(PASSIVE_PROVIDER)) {

            if (provider.equals(PASSIVE_PROVIDER)) {