commit 3acff1608103f6d746403d896e1482d41fbd8a31
author Sewook Seo <sewookseo@google.com> Mon Feb 06 07:16:14 2023 +0000
committer Sewook Seo <sewookseo@google.com> Mon Feb 06 14:41:48 2023 +0000
tree ae27ab5a298e5b40d4e5510fbe3648119cf9a359
parent 93498df0ec500468682ba38eedf84ebd393fe30d

[QNS] porting ag/19371050

ag/19371050: Allow HO with Low RTP EV at guarding state

Bug: 239379561
Test: atest QualifiedNetworksServiceTests
Change-Id: I0bfd8cadc78f94a1526314505a25a525b6fb39e4

services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java

diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java
index 7ae7e26..5932059 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCallStatusTracker.java
@@ -824,7 +824,8 @@
     }
 
     private void notifyCallType(int netCapability, int callType) {
-        Log.d(mLogTag, "notifyCallType:" + netCapability + ", callType:" + callType);
+        Log.d(mLogTag, "notifyCallType for " + QnsUtils.getNameOfNetCapability(netCapability)
+                + ", callType:" + callType);
         if (netCapability == NetworkCapabilities.NET_CAPABILITY_IMS
                 && mCallTypeChangedEventListener != null) {
             mCallTypeChangedEventListener.notifyResult(callType);

services/QualifiedNetworksService/src/com/android/telephony/qns/RestrictManager.java

diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/RestrictManager.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/RestrictManager.java
index 0837f00..beb316b 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/RestrictManager.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/RestrictManager.java
@@ -653,6 +653,8 @@
                 // transport type doesn't have 'no RTP reason', let's move back to previous
                 // transport type.
                 if ((reason & 1 << QnsConstants.RTP_LOW_QUALITY_REASON_NO_RTP) != 0) {
+                    releaseRestriction(QnsUtils.getOtherTransportType(mTransportType),
+                            RESTRICT_TYPE_GUARDING, true);
                     HashMap<Integer, Restriction> restrictionMap = mRestrictInfos
                             .get(QnsUtils.getOtherTransportType(mTransportType))
                             .getRestrictionMap();