Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af82ed33 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Cleaned up the flag backup_and_restore_for_enable_2g" into main

parents 8bba8734 32b663bb

flags/network.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -19,17 +19,6 @@ flag { 
  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

+4 −8
Original line number Diff line number Diff line
@@ -1624,12 +1624,10 @@ public class SubscriptionManagerService extends ISub.Stub { 
                            SubscriptionManager.RESTORE_SIM_SPECIFIC_SETTINGS_DATABASE_UPDATED)) {

                        logl("Sim specific settings changed the database.");

                        mSubscriptionDatabaseManager.reloadDatabaseSync();

                        if (mFeatureFlags.backupAndRestoreForEnable2g()) {

                        PhoneFactory.getPhone(phoneId)

                                .loadAllowedNetworksFromSubscriptionDatabase();

                    }

                }

                }



                log("updateSubscription: " + mSubscriptionDatabaseManager

                        .getSubscriptionInfoInternal(subId));
@@ -4337,11 +4335,9 @@ public class SubscriptionManagerService extends ISub.Stub { 
                    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);

            }

            }

        } finally {

            Binder.restoreCallingIdentity(token);

        }