commit af82ed3382f625d56bf1ca2dcbc535c7d21b22fb
author Jack Yu <jackyu@google.com> Tue Feb 18 11:00:58 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 18 11:00:58 2025 -0800
tree 0164aa1c23ce25e749e3a043a5904c0ced9fb2bb
parent 8bba8734bef701574c525252f83dfa09d48ca211
parent 32b663bb7bdca16155aa5af3ab68bfdf4ed9a7a4

Merge "Cleaned up the flag backup_and_restore_for_enable_2g" into main

flags/network.aconfig

diff --git a/flags/network.aconfig b/flags/network.aconfig
index a2398ad..bf2dcad 100644
--- a/flags/network.aconfig
+++ b/flags/network.aconfig
@@ -19,17 +19,6 @@
   bug: "239730435"
 }
 
-# OWNER=sangyun TARGET=24Q3
-flag {
-    name: "backup_and_restore_for_enable_2g"
-    namespace: "telephony"
-    description: "Support backup & restore for allow 2g (setting) option."
-    bug:"314734614"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
 # OWNER=yomna TARGET=25Q2
 flag {
   name: "security_algorithms_update_indications"

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
index 0039558..5017f0a 100644
--- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
+++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
@@ -1624,10 +1624,8 @@
                             SubscriptionManager.RESTORE_SIM_SPECIFIC_SETTINGS_DATABASE_UPDATED)) {
                         logl("Sim specific settings changed the database.");
                         mSubscriptionDatabaseManager.reloadDatabaseSync();
-                        if (mFeatureFlags.backupAndRestoreForEnable2g()) {
-                            PhoneFactory.getPhone(phoneId)
-                                    .loadAllowedNetworksFromSubscriptionDatabase();
-                        }
+                        PhoneFactory.getPhone(phoneId)
+                                .loadAllowedNetworksFromSubscriptionDatabase();
                     }
                 }
 
@@ -4337,10 +4335,8 @@
                     SubscriptionManager.RESTORE_SIM_SPECIFIC_SETTINGS_DATABASE_UPDATED)) {
                 logl("Sim specific settings changed the database.");
                 mSubscriptionDatabaseManager.reloadDatabaseSync();
-                if (mFeatureFlags.backupAndRestoreForEnable2g()) {
-                    Arrays.stream(PhoneFactory.getPhones())
-                            .forEach(Phone::loadAllowedNetworksFromSubscriptionDatabase);
-                }
+                Arrays.stream(PhoneFactory.getPhones())
+                        .forEach(Phone::loadAllowedNetworksFromSubscriptionDatabase);
             }
         } finally {
             Binder.restoreCallingIdentity(token);