commit 78cb36476bf1a53f05bfaabf2fdebf804a8eefe1
author huansun <huan.sun@t2mobile.com> Mon Oct 09 17:54:01 2023 +0800
committer jenkins-agent <jenkins-agent> Tue Oct 10 05:00:03 2023 +0200
tree d28dc3f07e088705b3e2318d4b93130fad44b289
parent b8ef62b290277d8617360e4f0a5f81a34128da7f

FP5-2652 [FP5 #391]MMS over wifi is not working

* Root Cause
  add some log in ap
* Solution
  add debug log
* Test Steps
  can not test local

Change-Id: I55832f5331cf993509bfbe6382edb740df8d7f03
(cherry picked from commit 89df26b6ce7a18b46372c80fefd3074b09c5e31d)

src/java/com/android/internal/telephony/data/DataNetworkController.java

diff --git a/src/java/com/android/internal/telephony/data/DataNetworkController.java b/src/java/com/android/internal/telephony/data/DataNetworkController.java
index c0d3538..47b502e 100644
--- a/src/java/com/android/internal/telephony/data/DataNetworkController.java
+++ b/src/java/com/android/internal/telephony/data/DataNetworkController.java
@@ -1337,6 +1337,7 @@
         // Use the data registration state from the modem instead of the current data registration
         // state, which can be overridden.
         int nriRegState = getDataRegistrationState(ss, transport);
+        log("nriRegState : " + nriRegState);
         if (nriRegState == NetworkRegistrationInfo.REGISTRATION_STATE_HOME
                 || nriRegState == NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING) return true;
 
@@ -1451,7 +1452,6 @@
         DataEvaluation evaluation = new DataEvaluation(reason);
         int transport = mAccessNetworksManager.getPreferredTransportByNetworkCapability(
                 networkRequest.getApnTypeNetworkCapability());
-
         // Bypass all checks for emergency network request.
         if (networkRequest.hasCapability(NetworkCapabilities.NET_CAPABILITY_EIMS)) {
             evaluation.addDataAllowedReason(DataAllowedReason.EMERGENCY_REQUEST);
@@ -1462,6 +1462,7 @@
             return evaluation;
         }
 
+        log("transport is =" + transport + "!serviceStateAllowsPSAttach(mServiceState, transport) is :" + !serviceStateAllowsPSAttach(mServiceState, transport));
         if (!serviceStateAllowsPSAttach(mServiceState, transport)) {
             evaluation.addDataDisallowedReason(DataDisallowedReason.NOT_IN_SERVICE);
         }
@@ -1523,6 +1524,8 @@
         // We are using getDesiredPowerState() instead of isRadioOn() because we also don't want
         // to setup data network when radio power is about to be turned off.
         // Besides, in legacy IWLAN mode, data should be allowed.
+        log("transport : =" + transport + "DataNetworkType is :" + getDataNetworkType(transport) + ", getDesiredPowerState :"
+             + !mPhone.getServiceStateTracker().getDesiredPowerState() + ", getRadioState : " + mPhone.mCi.getRadioState());
         if (transport == AccessNetworkConstants.TRANSPORT_TYPE_WWAN
                 && !mAccessNetworksManager.isInLegacyMode()
                 && getDataNetworkType(transport) != TelephonyManager.NETWORK_TYPE_IWLAN
@@ -3438,6 +3441,7 @@
             @TransportType int transport) {
         NetworkRegistrationInfo nri = ss.getNetworkRegistrationInfo(
                 NetworkRegistrationInfo.DOMAIN_PS, transport);
+        log("nri != null : " + (nri != null));
         if (nri != null) {
             return nri.getRegistrationState();
         }