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

Commit 4649b226 authored by Sangyun Yun's avatar Sangyun Yun Committed by Android (Google) Code Review
Browse files

Merge changes from topic "backup_and_restore_for_enable_2g" into main 

* changes:
  Reload allowed networks from db after restore content.
  Add feature flag for providers to support backup&restore networktypes
parents ce66ee1d c16690b4

flags/network.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -81,3 +81,14 @@ flag { 
  description: "Elevate NRI#getRejectCause from System to Public"

  bug: "239730435"

}



# OWNER=sangyun TARGET=24Q3

flag {

    name: "backup_and_restore_for_2g_setting"

    namespace: "telephony"

    description: "Support backup & restore for allow 2g (setting) option."

    bug:"314734614"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

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

+8 −0
Original line number Diff line number Diff line
@@ -1565,6 +1565,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.backupAndRestoreFor2gSetting()) {

                            PhoneFactory.getPhone(phoneId)

                                    .loadAllowedNetworksFromSubscriptionDatabase();

                        }

                    }

                }
@@ -4148,6 +4152,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.backupAndRestoreFor2gSetting()) {

                    Arrays.stream(PhoneFactory.getPhones())

                            .forEach(Phone::loadAllowedNetworksFromSubscriptionDatabase);

                }

            }

        } finally {

            Binder.restoreCallingIdentity(token);