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

Merge "Cleanup SUPL network request parameters for requestRouteToHostAddress" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-11 01:41:19 +00:00
committed by Android (Google) Code Review
parent ed8438ac87 fc5f2d1aec
commit 4b8ea4aa3c
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,15 +457,13 @@ class GnssNetworkConnectivityHandler {
}
mAGpsDataConnectionState = AGPS_DATA_CONNECTION_OPENING;
// The NetworkRequest.Builder class is not used to construct the network request because
// the ConnectivityService requires the network request to be constructed in this way
// to extend support for requestRouteToHostAddress() method for pre-gnss@2.0 devices.
NetworkCapabilities networkCapabilities = new NetworkCapabilities();
networkCapabilities.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
networkCapabilities.addCapability(getNetworkCapability(mAGpsType));
NetworkRequest networkRequest = new NetworkRequest(networkCapabilities,
getLegacyDataConnectionType(agpsType), ConnectivityManager.REQUEST_ID_UNSET,
NetworkRequest.Type.REQUEST);
// The transport type must be set to NetworkCapabilities.TRANSPORT_CELLULAR for the
// deprecated requestRouteToHostAddress() method in ConnectivityService to work for
// pre-gnss@2.0 devices.
NetworkRequest.Builder networkRequestBuilder = new NetworkRequest.Builder();
networkRequestBuilder.addCapability(getNetworkCapability(mAGpsType));
networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
NetworkRequest networkRequest = networkRequestBuilder.build();
mConnMgr.requestNetwork(
networkRequest,
mSuplConnectivityCallback,
@@ -487,19 +485,6 @@ class GnssNetworkConnectivityHandler {
}
}
private int getLegacyDataConnectionType(int agpsType) {
switch (agpsType) {
case AGPS_TYPE_C2K:
case AGPS_TYPE_SUPL:
return ConnectivityManager.TYPE_MOBILE_SUPL;
case AGPS_TYPE_EIMS:
return ConnectivityManager.TYPE_MOBILE_EMERGENCY;
case AGPS_TYPE_IMS:
return ConnectivityManager.TYPE_MOBILE_IMS;
default:
throw new IllegalArgumentException("agpsType: " + agpsType);
}
}
private void handleReleaseSuplConnection(int agpsDataConnStatus) {
if (DEBUG) {
String message = String.format(