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

Commit 99677f39 authored by Anil Admal's avatar Anil Admal Committed by android-build-merger
Browse files

Merge "Cleanup SUPL network request parameters for requestRouteToHostAddress"... 

Merge "Cleanup SUPL network request parameters for requestRouteToHostAddress" into qt-dev am: 4b8ea4aa
am: 73297cfd

Change-Id: I843d36f3735cd8401bb51681eb627e87f3117f52
parents af855d1c 73297cfd

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

+7 −22
Original line number Diff line number Diff line
@@ -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(