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

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

Browse Source 
Change-Id: I6e0c0b3f19d36e4602b1f3a58d6bb6f96619b931
This commit is contained in:
Joe Huang
2020-03-25 12:47:37 +00:00
committed by Automerger Merge Worker
parent 7fb71966b3 a02b54d79c
commit d04af3d22c
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,6 +711,15 @@ class GnssNetworkConnectivityHandler {
} }
TelephonyManager phone = (TelephonyManager) TelephonyManager phone = (TelephonyManager)
mContext.getSystemService(Context.TELEPHONY_SERVICE); 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(); ServiceState serviceState = phone.getServiceState();
String projection = null; String projection = null;
String selection = null; String selection = null;