Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1b3e797e1b540d97ff80a98ac9b0a746566e7a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-20 20:16:16 +00:00
committed by Automerger Merge Worker
parent db631b82bc b48dca76b3
commit aef26d59ac
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
View File

@@ -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.