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

Commit af75a492 authored by Joe Huang's avatar Joe Huang Committed by Automerger Merge Worker
Browse files

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

Merge "Use sub specific telephony for emergency supl" into rvc-dev am: a02b54d7 am: d04af3d2 am: 3a5f745b

Change-Id: Iac117db633bb56ac24ec06b5cbed8d09f86fd1a8
parents dcad6112 3a5f745b
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;