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

Commit cfa83963 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fix for crash in LocationManagerService"

parents 25496c2e 0f59f9ff

services/java/com/android/server/LocationManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -2135,11 +2135,14 @@ public class LocationManagerService extends ILocationManager.Stub { 


    private Location screenLocationLocked(Location location, String provider) {



        if (isMockProvider(LocationManager.NETWORK_PROVIDER)) {

            return location;

        }



        LocationProviderProxy providerProxy =

                (LocationProviderProxy)mProvidersByName.get(LocationManager.NETWORK_PROVIDER);

        if (mComboNlpPackageName == null || providerProxy == null ||

            false == provider.equals(LocationManager.NETWORK_PROVIDER) ||

            isMockProvider(LocationManager.NETWORK_PROVIDER)) {

            false == provider.equals(LocationManager.NETWORK_PROVIDER)) {

            return location;

        }