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

Commit 68937d0d authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Cleaned up the flag satellite_internet" into main

parents bddfefac 464aaacb

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

+17 −19
Original line number Diff line number Diff line
@@ -612,7 +612,6 @@ class GnssNetworkConnectivityHandler { 
        networkRequestBuilder.addCapability(getNetworkCapability(mAGpsType));

        networkRequestBuilder.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);



        if (com.android.internal.telephony.flags.Flags.satelliteInternet()) {

        // Add transport type NetworkCapabilities.TRANSPORT_SATELLITE on satellite network.

        TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);

        if (telephonyManager != null) {
@@ -633,7 +632,6 @@ class GnssNetworkConnectivityHandler { 
                }

            }

        }

        }



        // During an emergency call, and when we have cached the Active Sub Id, we set the

        // Network Specifier so that the network request goes to the correct Sub Id