Merge "Reload allowed networks from db after restore content." into main (a777312e) · Commits · e / os / android_frameworks_opt_telephony

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.backupAndRestoreForEnable2g()) {
		PhoneFactory.getPhone(phoneId)
		.loadAllowedNetworksFromSubscriptionDatabase();
		}
		}
		}

		@@ -4247,6 +4251,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()) {
		Arrays.stream(PhoneFactory.getPhones())
		.forEach(Phone::loadAllowedNetworksFromSubscriptionDatabase);
		}
		}
		} finally {
		Binder.restoreCallingIdentity(token);