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

Commit 32e7868e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18493241



Change-Id: If46ebbe45e117d8ba7a5f30f544c43a47055b4d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05476979 b48dca76

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

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


package com.android.server.location.gnss;



import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;



import android.content.Context;

import android.net.ConnectivityManager;

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

import java.util.Map;





/**

 * 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 (DEBUG) Log.d(TAG, "Adding Network Specifier: " + Integer.toString(mActiveSubId));

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

            networkRequestBuilder.removeCapability(NET_CAPABILITY_NOT_RESTRICTED);

        }

        NetworkRequest networkRequest = networkRequestBuilder.build();

        // Make sure we only have a single request.