Cleaned up the flag roaming_notification_for_single_data_network
Cleaned up the 24Q3 flag roaming_notification_for_single_data_network
Test: Basic telephony functionality tests
Test: atest TeleServiceTests
Bug: 249908996
Flag: EXEMPT flag cleanup
Change-Id: Ic0497314a45d1ccb2478ccf30e56b1dce2d798f4
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index b40ecea..68773f1 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -1042,26 +1042,24 @@
List<DataDisallowedReason> disallowReasons = phone.getDataNetworkController()
.getInternetDataDisallowedReasons();
- if (mFeatureFlags.roamingNotificationForSingleDataNetwork()) {
- if (disallowReasons.contains(DataDisallowedReason.ONLY_ALLOWED_SINGLE_NETWORK)
- && disallowReasons.contains(DataDisallowedReason.ROAMING_DISABLED)
- && (notificationReason == ROAMING_NOTIFICATION_REASON_DATA_SETTING_CHANGED
- || notificationReason
- == ROAMING_NOTIFICATION_REASON_DATA_ROAMING_SETTING_CHANGED)) {
- // If the ONLY_ALLOWED_SINGLE_NETWORK disallow reason has not yet been removed due
- // to a change in mobile_data (including roaming_data) settings, update roaming
- // notification again after the Internet is completely disconnected to check
- // ONLY_ALLOWED_SINGLE_NETWORK disallow reason is removed.
- mWaitForInternetDisconnection.set(true);
- Log.d(LOG_TAG, "updateDataRoamingStatus,"
- + " wait for internet disconnection for single data network");
- } else if (!disallowReasons.contains(DataDisallowedReason.ONLY_ALLOWED_SINGLE_NETWORK)
- && mWaitForInternetDisconnection.compareAndSet(true, false)) {
- // If the ONLY_ALLOWED_SINGLE_NETWORK disallow reason has been removed,
- // no longer wait for Internet disconnection.
- Log.d(LOG_TAG, "updateDataRoamingStatus,"
- + " cancel to wait for internet disconnection for single data network");
- }
+ if (disallowReasons.contains(DataDisallowedReason.ONLY_ALLOWED_SINGLE_NETWORK)
+ && disallowReasons.contains(DataDisallowedReason.ROAMING_DISABLED)
+ && (notificationReason == ROAMING_NOTIFICATION_REASON_DATA_SETTING_CHANGED
+ || notificationReason
+ == ROAMING_NOTIFICATION_REASON_DATA_ROAMING_SETTING_CHANGED)) {
+ // If the ONLY_ALLOWED_SINGLE_NETWORK disallow reason has not yet been removed due
+ // to a change in mobile_data (including roaming_data) settings, update roaming
+ // notification again after the Internet is completely disconnected to check
+ // ONLY_ALLOWED_SINGLE_NETWORK disallow reason is removed.
+ mWaitForInternetDisconnection.set(true);
+ Log.d(LOG_TAG, "updateDataRoamingStatus,"
+ + " wait for internet disconnection for single data network");
+ } else if (!disallowReasons.contains(DataDisallowedReason.ONLY_ALLOWED_SINGLE_NETWORK)
+ && mWaitForInternetDisconnection.compareAndSet(true, false)) {
+ // If the ONLY_ALLOWED_SINGLE_NETWORK disallow reason has been removed,
+ // no longer wait for Internet disconnection.
+ Log.d(LOG_TAG, "updateDataRoamingStatus,"
+ + " cancel to wait for internet disconnection for single data network");
}
updateDataRoamingStatus(notificationReason, disallowReasons, serviceState);