diff options
| author | Sewook Seo <sewookseo@google.com> | 2023-02-23 20:29:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-02-23 20:29:25 +0000 |
| commit | 9dc314f1e62cc381cd38f3ad4d8f5651a32ca9d7 (patch) | |
| tree | 7786f3ef028a4275f3945a0dafeac0860420ae46 /services/QualifiedNetworksService/src/com/android/telephony/qns | |
| parent | 63fb7ea77cbc98d68591542625023c399d610e10 (diff) | |
| parent | 9dfb573ac683f6b115ecdb7eaf922ec22f71ef82 (diff) | |
| download | Telephony-9dc314f1e62cc381cd38f3ad4d8f5651a32ca9d7.tar.gz | |
Merge "[QNS]notify callsate for emergency at active" into udc-dev
Diffstat (limited to 'services/QualifiedNetworksService/src/com/android/telephony/qns')
| -rw-r--r-- | services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java index 5932059..5e904d9 100644 --- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java +++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java @@ -390,8 +390,11 @@ public class QnsCallStatusTracker { void close() { mTelephonyListener.removeMediaQualityStatusCallback(mMediaQualityStatusConsumer); - mTelephonyListener.unregisterPreciseDataConnectionStateChanged( - mNetCapability, mActiveCallHandler); + if (mNetCapability != QnsConstants.INVALID_VALUE) { + mTelephonyListener.unregisterPreciseDataConnectionStateChanged( + mNetCapability, mActiveCallHandler); + mNetCapability = QnsConstants.INVALID_VALUE; + } if (mHandlerThread != null) { mHandlerThread.quitSafely(); } @@ -523,11 +526,11 @@ public class QnsCallStatusTracker { Log.d(mLogTag, "callEnded callType: " + mCallType + " netCapa:" + QnsUtils.getNameOfNetCapability(mNetCapability) + " " + sb.toString()); mCallType = QnsConstants.CALL_TYPE_IDLE; - mNetCapability = 0; - mAccessNetwork = AccessNetworkConstants.AccessNetworkType.UNKNOWN; - mTransportType = AccessNetworkConstants.TRANSPORT_TYPE_INVALID; mTelephonyListener.unregisterPreciseDataConnectionStateChanged( mNetCapability, mActiveCallHandler); + mNetCapability = QnsConstants.INVALID_VALUE; + mAccessNetwork = AccessNetworkConstants.AccessNetworkType.UNKNOWN; + mTransportType = AccessNetworkConstants.TRANSPORT_TYPE_INVALID; } void onMediaQualityStatusChanged(MediaQualityStatus status) { @@ -846,7 +849,8 @@ public class QnsCallStatusTracker { boolean hasEmergencyCall() { for (CallState cs : mCallStates) { - if (cs.getImsCallServiceType() == ImsCallProfile.SERVICE_TYPE_EMERGENCY) { + if (cs.getImsCallServiceType() == ImsCallProfile.SERVICE_TYPE_EMERGENCY + && cs.getCallState() == PreciseCallState.PRECISE_CALL_STATE_ACTIVE) { return true; } } |