diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java | 18 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java | 13 |
2 files changed, 30 insertions, 1 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java index d2c292221..6506bd8d2 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java @@ -4177,6 +4177,9 @@ public class WifiMetricsTest extends WifiBaseTest { add(60); }}); + mWifiMetrics.addNetworkSuggestionUserApprovalAppUiReaction(1, true); + mWifiMetrics.addNetworkSuggestionUserApprovalAppUiReaction(2, false); + dumpProtoAndDeserialize(); assertEquals(4, mDecodedProto.wifiNetworkSuggestionApiLog.numModification); @@ -4202,6 +4205,21 @@ public class WifiMetricsTest extends WifiBaseTest { assertEquals(WifiMetricsProto.WifiNetworkSuggestionApiLog.TYPE_NON_PRIVILEGED, mDecodedProto.wifiNetworkSuggestionApiLog.appCountPerType[2].appType); assertEquals(3, mDecodedProto.wifiNetworkSuggestionApiLog.appCountPerType[2].count); + + assertEquals(2, + mDecodedProto.wifiNetworkSuggestionApiLog.userApprovalAppUiReaction.length); + assertEquals(WifiMetricsProto.WifiNetworkSuggestionApiLog.ACTION_ALLOWED, + mDecodedProto.wifiNetworkSuggestionApiLog.userApprovalAppUiReaction[0] + .userAction); + assertEquals(true, + mDecodedProto.wifiNetworkSuggestionApiLog.userApprovalAppUiReaction[0] + .isDialog); + assertEquals(WifiMetricsProto.WifiNetworkSuggestionApiLog.ACTION_DISALLOWED, + mDecodedProto.wifiNetworkSuggestionApiLog.userApprovalAppUiReaction[1] + .userAction); + assertEquals(false, + mDecodedProto.wifiNetworkSuggestionApiLog.userApprovalAppUiReaction[1] + .isDialog); } private NetworkSelectionExperimentDecisions findUniqueNetworkSelectionExperimentDecisions( diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java index f2f9c8ad4..df729bfb1 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java @@ -2269,7 +2269,8 @@ public class WifiNetworkSuggestionsManagerTest extends WifiBaseTest { sendBroadcastForUserActionOnApp( NOTIFICATION_USER_DISMISSED_INTENT_ACTION, TEST_PACKAGE_1, TEST_UID_1); reset(mNotificationManger); - + verify(mWifiMetrics).addNetworkSuggestionUserApprovalAppUiReaction( + WifiNetworkSuggestionsManager.ACTION_USER_DISMISS, false); // Simulate finding the network in scan results. mWifiNetworkSuggestionsManager.getNetworkSuggestionsForScanDetail( createScanDetailForNetwork(networkSuggestion.wifiConfiguration)); @@ -2326,6 +2327,8 @@ public class WifiNetworkSuggestionsManagerTest extends WifiBaseTest { // Verify config store interactions. verify(mWifiConfigManager, times(2)).saveToStore(true); assertTrue(mDataSource.hasNewDataToSerialize()); + verify(mWifiMetrics).addNetworkSuggestionUserApprovalAppUiReaction( + WifiNetworkSuggestionsManager.ACTION_USER_ALLOWED_APP, false); reset(mNotificationManger); // We should not resend the notification next time the network is found in scan results. @@ -2376,6 +2379,8 @@ public class WifiNetworkSuggestionsManagerTest extends WifiBaseTest { // Verify config store interactions. verify(mWifiConfigManager, times(2)).saveToStore(true); assertTrue(mDataSource.hasNewDataToSerialize()); + verify(mWifiMetrics).addNetworkSuggestionUserApprovalAppUiReaction( + WifiNetworkSuggestionsManager.ACTION_USER_DISALLOWED_APP, false); reset(mNotificationManger); @@ -2544,6 +2549,8 @@ public class WifiNetworkSuggestionsManagerTest extends WifiBaseTest { // Verify config store interactions. verify(mWifiConfigManager, times(2)).saveToStore(true); assertTrue(mDataSource.hasNewDataToSerialize()); + verify(mWifiMetrics).addNetworkSuggestionUserApprovalAppUiReaction( + WifiNetworkSuggestionsManager.ACTION_USER_ALLOWED_APP, true); // We should not resend the notification next time the network is found in scan results. mWifiNetworkSuggestionsManager.getNetworkSuggestionsForScanDetail( @@ -2588,6 +2595,8 @@ public class WifiNetworkSuggestionsManagerTest extends WifiBaseTest { // Verify config store interactions. verify(mWifiConfigManager, times(2)).saveToStore(true); assertTrue(mDataSource.hasNewDataToSerialize()); + verify(mWifiMetrics).addNetworkSuggestionUserApprovalAppUiReaction( + WifiNetworkSuggestionsManager.ACTION_USER_DISALLOWED_APP, true); // Now trigger the app-ops callback to ensure we remove all of their suggestions. AppOpsManager.OnOpChangedListener listener = mAppOpChangedListenerCaptor.getValue(); @@ -2640,6 +2649,8 @@ public class WifiNetworkSuggestionsManagerTest extends WifiBaseTest { // Verify no new config store or app-op interactions. verify(mWifiConfigManager).saveToStore(true); // 1 already done for add verify(mAppOpsManager, never()).setMode(any(), anyInt(), any(), anyInt()); + verify(mWifiMetrics).addNetworkSuggestionUserApprovalAppUiReaction( + WifiNetworkSuggestionsManager.ACTION_USER_DISMISS, true); // We should resend the notification next time the network is found in scan results. mWifiNetworkSuggestionsManager.getNetworkSuggestionsForScanDetail( |