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

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

Merge "Allow SUPL to use restricted network in emergency" into tm-dev

parents 4f87ba04 81b09357

services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ 




package com.android.server.location.gnss;

package com.android.server.location.gnss;





import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;



import android.content.Context;

import android.content.Context;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager;

import android.net.LinkAddress;

import android.net.LinkAddress;
@@ -47,7 +49,6 @@ import java.util.Iterator; 
import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;







/**

/**

 * Handles network connection requests and network state change updates for AGPS data download.

 * Handles network connection requests and network state change updates for AGPS data download.

 */

 */
@@ -582,6 +583,7 @@ class GnssNetworkConnectivityHandler { 
        if (mNiHandler.getInEmergency() && mActiveSubId >= 0) {

        if (mNiHandler.getInEmergency() && mActiveSubId >= 0) {

            if (DEBUG) Log.d(TAG, "Adding Network Specifier: " + Integer.toString(mActiveSubId));

            if (DEBUG) Log.d(TAG, "Adding Network Specifier: " + Integer.toString(mActiveSubId));

            networkRequestBuilder.setNetworkSpecifier(Integer.toString(mActiveSubId));

            networkRequestBuilder.setNetworkSpecifier(Integer.toString(mActiveSubId));

            networkRequestBuilder.removeCapability(NET_CAPABILITY_NOT_RESTRICTED);

        }

        }

        NetworkRequest networkRequest = networkRequestBuilder.build();

        NetworkRequest networkRequest = networkRequestBuilder.build();

        // Make sure we only have a single request.

        // Make sure we only have a single request.