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

Commit a02b54d7 authored by Joe Huang's avatar Joe Huang Committed by Android (Google) Code Review
Browse files

Merge "Use sub specific telephony for emergency supl" into rvc-dev

parents dffe0cee 61e565b7
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -711,6 +711,15 @@ class GnssNetworkConnectivityHandler {
        }
        TelephonyManager phone = (TelephonyManager)
                mContext.getSystemService(Context.TELEPHONY_SERVICE);
        // During an emergency call with an active sub id, get the Telephony Manager specific
        // to the active sub to get the correct value from getServiceState and getNetworkType
        if (mNiHandler.getInEmergency() && mActiveSubId >= 0) {
            TelephonyManager subIdTelManager =
                    phone.createForSubscriptionId(mActiveSubId);
            if (subIdTelManager != null) {
                phone = subIdTelManager;
            }
        }
        ServiceState serviceState = phone.getServiceState();
        String projection = null;
        String selection = null;