Projects >> frameworks_base_disabled >>5972e52e15e075e40dfcdc3ffaed1b7c4e2afac1

Chunk
Conflicting content 
        mEnabledProviders.add(passiveProvider.getName());

        // initialize external network location and geocoder services
<<<<<<< HEAD
        PackageManager pm = mContext. getPackageManager();
        Resources resources = mContext.getResources();
        String serviceName = resources.getString(
                com.android.internal.R.string.config_networkLocationProvider);
        if (serviceName != null && pm.resolveService(new Intent(serviceName), 0) != null) {
=======
        if (mNetworkLocationProviderPackageName != null) {
>>>>>>> 53b070275568af0d1016e019fdf0aa1ed28665f1
            mNetworkLocationProvider =
                new LocationProviderProxy(mContext, LocationManager.NETWORK_PROVIDER,
                        mNetworkLocationProviderPackageName, mLocationHandler);
Solution content 
        mEnabledProviders.add(passiveProvider.getName());

        // initialize external network location and geocoder services
        PackageManager pm = mContext.getPackageManager();
        if (mNetworkLocationProviderPackageName != null &&
                pm.resolveService(new Intent(mNetworkLocationProviderPackageName), 0) != null) {
            mNetworkLocationProvider =
                new LocationProviderProxy(mContext, LocationManager.NETWORK_PROVIDER,
                        mNetworkLocationProviderPackageName, mLocationHandler);
File
LocationManagerService.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
            addProvider(mNetworkLocationProvider);
        }

<<<<<<< HEAD
        serviceName = resources.getString(com.android.internal.R.string.config_geocodeProvider);
        if (serviceName != null && pm.resolveService(new Intent(serviceName), 0) != null) {
            mGeocodeProvider = new GeocoderProxy(mContext, serviceName);
=======
        if (mGeocodeProviderPackageName != null) {
            mGeocodeProvider = new GeocoderProxy(mContext, mGeocodeProviderPackageName);
>>>>>>> 53b070275568af0d1016e019fdf0aa1ed28665f1
        }

        updateProvidersLocked();
Solution content 
            addProvider(mNetworkLocationProvider);
        }

        if (mGeocodeProviderPackageName != null &&
                pm.resolveService(new Intent(mGeocodeProviderPackageName), 0) != null) {
            mGeocodeProvider = new GeocoderProxy(mContext, mGeocodeProviderPackageName);
        }

        updateProvidersLocked();
File
LocationManagerService.java
Developer's decision
Manual
Kind of conflict
Attribute
If statement
Method invocation
Variable