summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDante Russo <quic_drusso@quicinc.com>2022-01-04 15:25:23 -0800
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-03-25 01:17:16 +0000
commit7ba4df08d29b8011e6402794958163fbe1a6265c (patch)
tree8796018aaa47186aa784714f24d4ab8292c7dbf8
parentabf676c99cab07f0da49628fccf3bb6465fa916b (diff)
downloadbase-7ba4df08d29b8011e6402794958163fbe1a6265c.tar.gz
Dialing phone state should update active sub
SUPL emergency request can come into the framework while in Dialing phone state before the call is answered and goes to Active phone state. The active sub being cached should be updated in either Dialing state or Active state to ensure the SUPL emergency request is made on the correct sub. Test: manual Bug: 211377690 Bug: 214088538 Change-Id: Ic2fa89b76a0e43caa1ea4470c38389c42f506148 (cherry picked from commit 7b0ab311f3572fe795598807466487b10495a3ce) (cherry picked from commit cde6691a4daa1f23cf6cf1f7744c620914182d09) Merged-In: Ic2fa89b76a0e43caa1ea4470c38389c42f506148
-rw-r--r--services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
index 4d9253eff69e..718f98a0f04b 100644
--- a/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
+++ b/services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java
@@ -215,7 +215,9 @@ class GnssNetworkConnectivityHandler {
}
@Override
public void onPreciseCallStateChanged(PreciseCallState state) {
- if (state.PRECISE_CALL_STATE_ACTIVE == state.getForegroundCallState()) {
+ if (PreciseCallState.PRECISE_CALL_STATE_ACTIVE == state.getForegroundCallState()
+ || PreciseCallState.PRECISE_CALL_STATE_DIALING
+ == state.getForegroundCallState()) {
mActiveSubId = mSubId;
if (DEBUG) Log.d(TAG, "mActiveSubId: " + mActiveSubId);
}