Exclude IWLAN from data dormant

For now exclude IWLAN from data dormant and data activity.
The network type controller is interfered by the incorrect
data activity triggered by IWLAN tear down, thus showing
incorrect icon for 5G.

This might not 100% fix the issue because Android data
activity state is mixed with data traffic counting, not
exactly taking the signal from modem. To fix 5G icon issue,
we need to make physical config channel reflecting the RRC
connection state in S.

Fix: 158557159
Test: DcControllerTest
Change-Id: Iff8c36f5093903d854420968ebeebf79e796da3f

1 files changed, 3 insertions, 0 deletions

diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java
index 9c1d1a854c..a0c9913e0a 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcControllerTest.java
@@ -36,6 +36,7 @@ import android.net.LinkProperties;
 import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Looper;
+import android.telephony.AccessNetworkConstants;
 import android.telephony.data.ApnSetting;
 import android.telephony.data.DataCallResponse;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -99,6 +100,8 @@ public class DcControllerTest extends TelephonyTest {
         LinkProperties lp = new LinkProperties();
         mResult = new UpdateLinkPropertyResult(lp);
         doReturn(mResult).when(mDc).updateLinkProperty(any(DataCallResponse.class));
+        doReturn(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
+                .when(mDataServiceManager).getTransportType();
 
         mDcc = DcController.makeDcc(mPhone, mDcTracker, mDataServiceManager,
                 new Handler(Looper.myLooper()), "");