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

Commit a56499d9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "wifi: Fix unnecessary notification after restoring config from cloud."... 

Merge "wifi: Fix unnecessary notification after restoring config from cloud." into tm-qpr-dev am: 818d8099

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19395538



Change-Id: I8f301a781ba66a26bbcd56271e9e036779626df7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0640e93 818d8099

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+3 −4
Original line number Diff line number Diff line
@@ -1076,7 +1076,9 @@ public class SettingsBackupAgent extends BackupAgentHelper { 
            SoftApConfiguration storedConfig = mWifiManager.getSoftApConfiguration();



            if (isNeedToNotifyUserConfigurationHasChanged(configInCloud, storedConfig)) {

                Log.d(TAG, "restored ap configuration requires a conversion, notify the user");

                Log.d(TAG, "restored ap configuration requires a conversion, notify the user"

                        + ", configInCloud is " + configInCloud + " but storedConfig is "

                        + storedConfig);

                WifiSoftApConfigChangedNotifier.notifyUserOfConfigConversion(this);

            }

        }
@@ -1115,9 +1117,6 @@ public class SettingsBackupAgent extends BackupAgentHelper { 
                        == storedConfig.getBridgedModeOpportunisticShutdownTimeoutMillis()

                && Objects.equals(configInCloud.getVendorElements(),

                        storedConfig.getVendorElements())

                && (configInCloud.getPersistentRandomizedMacAddress() != null

                        ? Objects.equals(configInCloud.getPersistentRandomizedMacAddress(),

                        storedConfig.getPersistentRandomizedMacAddress()) : true)

                && Arrays.equals(configInCloud.getAllowedAcsChannels(

                        SoftApConfiguration.BAND_2GHZ),

                        storedConfig.getAllowedAcsChannels(SoftApConfiguration.BAND_2GHZ))