diff options
| author | 2022-07-29 15:22:43 +0000 | |
|---|---|---|
| committer | 2022-07-29 15:22:43 +0000 | |
| commit | c11c89f3c3bbb98d03315f217bd93f3936004a54 (patch) | |
| tree | 85980edc4b49340a7c85784b2e06e463d7e2a0a1 | |
| parent | fbb2c1876a5e15e5dbae31fee4dad8c70f9f2375 (diff) | |
| parent | a56499d901c841772db9d86d74780a88b88fc0d1 (diff) | |
Merge "wifi: Fix unnecessary notification after restoring config from cloud." into tm-qpr-dev am: 818d809993 am: a56499d901
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19395538
Change-Id: I7358b2e88ef94cff15c5e3453c047a2028009f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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)) |