diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-03 03:09:55 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-03 03:09:55 +0000 |
| commit | c8cbf1efda1c1d75ea678c06758836dc78b850e9 (patch) | |
| tree | fcec130dab89d969a4255fcd722e1cc9c1cf8a44 | |
| parent | ffe7d8f6866653f02a39f2bbe3337ee1c3d9283a (diff) | |
| parent | 7abed5d4cf741aca02836d06664263dc1e3aa699 (diff) | |
| download | android_frameworks_opt_net_wifi-c8cbf1efda1c1d75ea678c06758836dc78b850e9.tar.gz android_frameworks_opt_net_wifi-c8cbf1efda1c1d75ea678c06758836dc78b850e9.tar.bz2 android_frameworks_opt_net_wifi-c8cbf1efda1c1d75ea678c06758836dc78b850e9.zip | |
Snap for 5704971 from 7abed5d4cf741aca02836d06664263dc1e3aa699 to qt-release
Change-Id: I85a3361a3eba5ef344e439d79a33674dbe3a6499
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java | 1 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java b/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java index c2aade90b..6a5db5d23 100644 --- a/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java +++ b/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java @@ -714,6 +714,7 @@ public class WifiNetworkSuggestionsManager { Log.v(TAG, "Setting the app " + (approved ? "approved" : "not approved")); } perAppInfo.hasUserApproved = approved; + saveToStore(); } /** diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java index ca7c13e31..ade54bd14 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java @@ -1817,6 +1817,10 @@ public class WifiNetworkSuggestionsManagerTest { // Cancel the notification. verify(mNotificationManger).cancel(SystemMessage.NOTE_NETWORK_SUGGESTION_AVAILABLE); + // Verify config store interactions. + verify(mWifiConfigManager, times(2)).saveToStore(true); + assertTrue(mDataSource.hasNewDataToSerialize()); + reset(mNotificationManger); // We should not resend the notification next time the network is found in scan results. mWifiNetworkSuggestionsManager.getNetworkSuggestionsForScanDetail( @@ -1858,6 +1862,10 @@ public class WifiNetworkSuggestionsManagerTest { // Cancel the notification. verify(mNotificationManger).cancel(SystemMessage.NOTE_NETWORK_SUGGESTION_AVAILABLE); + // Verify config store interactions. + verify(mWifiConfigManager, times(2)).saveToStore(true); + assertTrue(mDataSource.hasNewDataToSerialize()); + reset(mNotificationManger); // Now trigger the app-ops callback to ensure we remove all of their suggestions. |