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

Commit ffc3f8f4 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Call LocationManager.sendNiResponse() instead of calling directly to GpsLocationProvider 



Change-Id: I190fb70a608539f77080db64be1bd5b8dc8519e3
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent effca85f

core/java/com/android/internal/app/NetInitiatedActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.os.ServiceManager; 
import android.widget.Toast;

import android.util.Log;

import android.location.LocationManager;

import com.android.internal.location.GpsLocationProvider;

import com.android.internal.location.GpsNetInitiatedHandler;



/**

location/java/com/android/internal/location/GpsLocationProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ public class GpsLocationProvider implements LocationProviderInterface { 
    public GpsLocationProvider(Context context, ILocationManager locationManager) {

        mContext = context;

        mLocationManager = locationManager;

        mNIHandler = new GpsNetInitiatedHandler(context, this);

        mNIHandler = new GpsNetInitiatedHandler(context);



        mLocation.setExtras(mLocationExtras);

location/java/com/android/internal/location/GpsNetInitiatedHandler.java

+5 −10
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.NotificationManager; 
import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;

import android.location.LocationManager;

import android.os.Bundle;

import android.os.RemoteException;

import android.util.Log;
@@ -81,7 +82,7 @@ public class GpsNetInitiatedHandler { 
    private final Context mContext;

    

    // parent gps location provider

    private final GpsLocationProvider mGpsLocationProvider;

    private final LocationManager mLocationManager;

    

    // configuration of notificaiton behavior

    private boolean mPlaySounds = false;
@@ -122,9 +123,9 @@ public class GpsNetInitiatedHandler { 
     */

    private Notification mNiNotification;

    

    public GpsNetInitiatedHandler(Context context, GpsLocationProvider gpsLocationProvider) {

    public GpsNetInitiatedHandler(Context context) {

    	mContext = context;       

    	mGpsLocationProvider = gpsLocationProvider;

    	mLocationManager = (LocationManager)context.getSystemService(Context.LOCATION_SERVICE);

    }

    

    // Handles NI events from HAL
@@ -157,13 +158,7 @@ public class GpsNetInitiatedHandler { 
    		!notif.needNotify && !notif.needVerify || 

    		 notif.privacyOverride)

    	{

    		try {

    			mGpsLocationProvider.getNetInitiatedListener().sendNiResponse(notif.notificationId, GPS_NI_RESPONSE_ACCEPT);

    		} 

    		catch (RemoteException e)

    		{

    			Log.e(TAG, e.getMessage());

    		}

    	    mLocationManager.sendNiResponse(notif.notificationId, GPS_NI_RESPONSE_ACCEPT);

    	}

    	

    	//////////////////////////////////////////////////////////////////////////