Cleaned up the flag dismiss_network_selection_notification_on_sim_disable
Cleaned up the 24Q2 flag dismiss_network_selection_notification_on_sim_disable
Test: atest TeleServiceTests
Test: Basic telephony functionality tests
Bug: 310594186
Flag: EXEMPT flag cleanup
Change-Id: I02b76a98d587d2cccdd1d12804406e0bd7cd987c
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 1139850..4fe2d24 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -843,11 +843,6 @@
* @param subId The subscription ID
*/
void updateNetworkSelection(int serviceState, int subId) {
- if (!mFeatureFlags.dismissNetworkSelectionNotificationOnSimDisable()) {
- updateNetworkSelectionForFeatureDisabled(serviceState, subId);
- return;
- }
-
// for dismissNetworkSelectionNotificationOnSimDisable feature enabled.
int phoneId = SubscriptionManager.getPhoneId(subId);
Phone phone = SubscriptionManager.isValidPhoneId(phoneId) ?
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 26fe0f2..b40ecea 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -1341,8 +1341,6 @@
pw.increaseIndent();
pw.println("FeatureFlags:");
pw.increaseIndent();
- pw.println("dismissNetworkSelectionNotificationOnSimDisable="
- + mFeatureFlags.dismissNetworkSelectionNotificationOnSimDisable());
pw.decreaseIndent();
pw.println("mCurrentRoamingNotification=" + mCurrentRoamingNotification);
pw.println("mDefaultDataSubId=" + mDefaultDataSubId);