From cde6691a4daa1f23cf6cf1f7744c620914182d09 Mon Sep 17 00:00:00 2001
From: Dante Russo <quic_drusso@quicinc.com>
Date: Tue, 4 Jan 2022 15:25:23 -0800
Subject: [PATCH] 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)
---
 .../server/location/gnss/GnssNetworkConnectivityHandler.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 4d9253eff69e8..718f98a0f04bc 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);
             }