diff options
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 5088533ccdd8..d3afccc9dcb1 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -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)) |