Revert "FP5-2876 MMS over vowifi failed when airplane mode enabled"
This reverts commit a68137a1f7fc0752f003adeb7b90285c1c75d7fd.
Change-Id: I4c95f15a793c57a647f335bbe740d954f91bdf81
(cherry picked from commit 77d485325a0d227c9aa239b0bef864f7420f93d5)
diff --git a/src/java/com/android/internal/telephony/data/AccessNetworksManager.java b/src/java/com/android/internal/telephony/data/AccessNetworksManager.java
old mode 100755
new mode 100644
index cf983ef..64f52db
--- a/src/java/com/android/internal/telephony/data/AccessNetworksManager.java
+++ b/src/java/com/android/internal/telephony/data/AccessNetworksManager.java
@@ -51,10 +51,6 @@
import android.telephony.data.IQualifiedNetworksServiceCallback;
import android.telephony.data.QualifiedNetworksService;
import android.telephony.data.ThrottleStatus;
-import android.telephony.ims.stub.ImsRegistrationImplBase;
-import android.telephony.NetworkRegistrationInfo;
-import android.telephony.NetworkRegistrationInfo.RegistrationState;
-import android.telephony.ServiceState;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.IndentingPrintWriter;
@@ -373,7 +369,6 @@
List<QualifiedNetworks> qualifiedNetworksList = new ArrayList<>();
int satisfiedApnTypes = 0;
- boolean isMmsApnTypeChanged = false;//[BUG]-Modify by shaopan.tang 2023-12-05 FP5-2876 MMS over vowifi failed when airplane mode enabled
for (int apnType : SUPPORTED_APN_TYPES) {
if ((apnTypes & apnType) == apnType) {
// skip the APN anomaly detection if not using the T data stack
@@ -381,14 +376,6 @@
satisfiedApnTypes |= apnType;
}
- //[BUG]-Modify-Begin by shaopan.tang 2023-12-05 FP5-2876 MMS over vowifi failed when airplane mode enabled
- //Keep records for mms type ever changed from lower layer
- if (!isMmsApnTypeChanged && (ApnSetting.TYPE_MMS == apnType)){
- log("APN " + ApnSetting.getApnTypesStringFromBitmask(apnType) + " changed.");
- isMmsApnTypeChanged = true;
- }
- //[BUG]-Modify-End by shaopan.tang
-
if (mAvailableNetworks.get(apnType) != null) {
if (Arrays.equals(mAvailableNetworks.get(apnType),
qualifiedNetworkTypes)) {
@@ -435,57 +422,9 @@
setPreferredTransports(qualifiedNetworksList);
mQualifiedNetworksChangedRegistrants.notifyResult(qualifiedNetworksList);
}
-
- //[BUG]-Modify-Begin by shaopan.tang 2023-12-05 FP5-2876 MMS over vowifi failed when airplane mode enabled
- // update mms APN into preferred transports list if no update from lower layer
- // when cellular available, use cellular for mms;
- // if no cellular, use IWLAN for mms when VoWiFi registered
- log("isMmsApnTypeChanged: " + isMmsApnTypeChanged);
- if (!isMmsApnTypeChanged){
- int RegistrationState = getDataRegistrationState(mPhone.getServiceState(), AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
- log("RegistrationState for wwan: " + RegistrationState);
- if ((NetworkRegistrationInfo.REGISTRATION_STATE_HOME == RegistrationState)
- || (NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING == RegistrationState)){
- mPreferredTransports.put(ApnSetting.TYPE_MMS,
- AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
- log("Save mms apn with transport type wwan into mPreferredTransports!");
- } else {
- RegistrationState = getDataRegistrationState(mPhone.getServiceState(), AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
- boolean isImsRegTechIWlan = (mPhone.getImsPhone().getImsRegistrationTech() == ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN);
- log("RegistrationState for wlan: " + RegistrationState + " , isImsRegTechIWlan: " + isImsRegTechIWlan);
- if (isImsRegTechIWlan &&
- ((NetworkRegistrationInfo.REGISTRATION_STATE_HOME == RegistrationState)
- || (NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING == RegistrationState))){
- mPreferredTransports.put(ApnSetting.TYPE_MMS,
- AccessNetworkConstants.TRANSPORT_TYPE_WLAN);
- log("Save mms apn with transport type wlan into mPreferredTransports!");
- }
- }
- }
- //[BUG]-Modify-End by shaopan.tang
}
}
- //[BUG]-Modify-Begin by shaopan.tang 2023-12-05 FP5-2876 MMS over vowifi failed when airplane mode enabled
- /**
- * Get data registration state based on transport.
- *
- * @param ss The service state from which to extract the data registration state.
- * @param transport The transport.
- * @return The registration state.
- */
- private @RegistrationState int getDataRegistrationState(@NonNull ServiceState ss,
- @TransportType int transport) {
- NetworkRegistrationInfo nri = ss.getNetworkRegistrationInfo(
- NetworkRegistrationInfo.DOMAIN_PS, transport);
- log("nri != null : " + (nri != null));
- if (nri != null) {
- return nri.getRegistrationState();
- }
- return NetworkRegistrationInfo.REGISTRATION_STATE_UNKNOWN;
- }
- //[BUG]-Modify-End by shaopan.tang
-
/**
* Access networks manager callback. This should be only used by {@link DataNetworkController}.
*/