From b2d10e2c1c513274d2ee26072146d201056c8441 Mon Sep 17 00:00:00 2001 From: Nate Jiang Date: Wed, 29 Jul 2020 23:14:31 +0000 Subject: Revert "Revert "Update IMSI protection notification flow"" This reverts commit deeb41a8521374e4390e32e1f7942c08c8886886. Reason for revert: Automerger issue with wrong Merged-In CL Bug: 161932419 Merged-In: I8be7c1b9e66162fdd244946b47367290116a7747 Change-Id: I75f57cbfda4407249c1170dd14a039315e3dcb53 --- .../server/wifi/WifiCarrierInfoManagerTest.java | 75 ++++++++++++++-------- 1 file changed, 50 insertions(+), 25 deletions(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/WifiCarrierInfoManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiCarrierInfoManagerTest.java index 2c1c2ec91..750e8d46b 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiCarrierInfoManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiCarrierInfoManagerTest.java @@ -19,6 +19,7 @@ package com.android.server.wifi; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.when; import static com.android.server.wifi.WifiCarrierInfoManager.NOTIFICATION_USER_ALLOWED_CARRIER_INTENT_ACTION; +import static com.android.server.wifi.WifiCarrierInfoManager.NOTIFICATION_USER_CLICKED_INTENT_ACTION; import static com.android.server.wifi.WifiCarrierInfoManager.NOTIFICATION_USER_DISALLOWED_CARRIER_INTENT_ACTION; import static com.android.server.wifi.WifiCarrierInfoManager.NOTIFICATION_USER_DISMISSED_INTENT_ACTION; @@ -166,6 +167,7 @@ public class WifiCarrierInfoManagerTest extends WifiBaseTest { when(mNotificationBuilder.setTicker(any())).thenReturn(mNotificationBuilder); when(mNotificationBuilder.setContentTitle(any())).thenReturn(mNotificationBuilder); when(mNotificationBuilder.setStyle(any())).thenReturn(mNotificationBuilder); + when(mNotificationBuilder.setContentIntent(any())).thenReturn(mNotificationBuilder); when(mNotificationBuilder.setDeleteIntent(any())).thenReturn(mNotificationBuilder); when(mNotificationBuilder.setShowWhen(anyBoolean())).thenReturn(mNotificationBuilder); when(mNotificationBuilder.setLocalOnly(anyBoolean())).thenReturn(mNotificationBuilder); @@ -1538,26 +1540,13 @@ public class WifiCarrierInfoManagerTest extends WifiBaseTest { verify(mNotificationManger).cancel(SystemMessage.NOTE_NETWORK_SUGGESTION_AVAILABLE); verify(mWifiMetrics).addUserApprovalCarrierUiReaction( WifiCarrierInfoManager.ACTION_USER_ALLOWED_CARRIER, false); - validateUserApprovalDialog(CARRIER_NAME); - - // Simulate user clicking on allow in the dialog. - ArgumentCaptor clickListenerCaptor = - ArgumentCaptor.forClass(DialogInterface.OnClickListener.class); - verify(mAlertDialogBuilder, atLeastOnce()).setPositiveButton( - any(), clickListenerCaptor.capture()); - assertNotNull(clickListenerCaptor.getValue()); - clickListenerCaptor.getValue().onClick(mAlertDialog, 0); - mLooper.dispatchAll(); - ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mContext).sendBroadcast(intentCaptor.capture()); - assertEquals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, intentCaptor.getValue().getAction()); verify(mWifiConfigManager).saveToStore(true); assertTrue(mImsiDataSource.hasNewDataToSerialize()); assertTrue(mWifiCarrierInfoManager .hasUserApprovedImsiPrivacyExemptionForCarrier(DATA_CARRIER_ID)); verify(mListener).onUserAllowed(DATA_CARRIER_ID); verify(mWifiMetrics).addUserApprovalCarrierUiReaction( - WifiCarrierInfoManager.ACTION_USER_ALLOWED_CARRIER, true); + WifiCarrierInfoManager.ACTION_USER_ALLOWED_CARRIER, false); } @Test @@ -1607,7 +1596,7 @@ public class WifiCarrierInfoManagerTest extends WifiBaseTest { validateImsiProtectionNotification(CARRIER_NAME); //Simulate user dismissal the notification sendBroadcastForUserActionOnImsi(NOTIFICATION_USER_DISMISSED_INTENT_ACTION, - CARRIER_NAME, DATA_SUBID); + CARRIER_NAME, DATA_CARRIER_ID); verify(mWifiMetrics).addUserApprovalCarrierUiReaction( WifiCarrierInfoManager.ACTION_USER_DISMISS, false); reset(mNotificationManger); @@ -1618,7 +1607,7 @@ public class WifiCarrierInfoManagerTest extends WifiBaseTest { // As there is notification is active, should not send notification again. sendBroadcastForUserActionOnImsi(NOTIFICATION_USER_DISMISSED_INTENT_ACTION, - CARRIER_NAME, DATA_SUBID); + CARRIER_NAME, DATA_CARRIER_ID); verifyNoMoreInteractions(mNotificationManger); verify(mWifiConfigManager, never()).saveToStore(true); assertFalse(mImsiDataSource.hasNewDataToSerialize()); @@ -1642,12 +1631,10 @@ public class WifiCarrierInfoManagerTest extends WifiBaseTest { mWifiCarrierInfoManager.sendImsiProtectionExemptionNotificationIfRequired(DATA_CARRIER_ID); validateImsiProtectionNotification(CARRIER_NAME); - // Simulate user clicking on allow in the notification. - sendBroadcastForUserActionOnImsi(NOTIFICATION_USER_ALLOWED_CARRIER_INTENT_ACTION, - CARRIER_NAME, DATA_SUBID); + // Simulate user clicking on the notification. + sendBroadcastForUserActionOnImsi(NOTIFICATION_USER_CLICKED_INTENT_ACTION, + CARRIER_NAME, DATA_CARRIER_ID); verify(mNotificationManger).cancel(SystemMessage.NOTE_NETWORK_SUGGESTION_AVAILABLE); - verify(mWifiMetrics).addUserApprovalCarrierUiReaction( - WifiCarrierInfoManager.ACTION_USER_ALLOWED_CARRIER, false); validateUserApprovalDialog(CARRIER_NAME); // Simulate user clicking on disallow in the dialog. @@ -1685,11 +1672,10 @@ public class WifiCarrierInfoManagerTest extends WifiBaseTest { mWifiCarrierInfoManager.sendImsiProtectionExemptionNotificationIfRequired(DATA_CARRIER_ID); validateImsiProtectionNotification(CARRIER_NAME); - sendBroadcastForUserActionOnImsi(NOTIFICATION_USER_ALLOWED_CARRIER_INTENT_ACTION, - CARRIER_NAME, DATA_SUBID); + // Simulate user clicking on the notification. + sendBroadcastForUserActionOnImsi(NOTIFICATION_USER_CLICKED_INTENT_ACTION, + CARRIER_NAME, DATA_CARRIER_ID); verify(mNotificationManger).cancel(SystemMessage.NOTE_NETWORK_SUGGESTION_AVAILABLE); - verify(mWifiMetrics).addUserApprovalCarrierUiReaction( - WifiCarrierInfoManager.ACTION_USER_ALLOWED_CARRIER, false); validateUserApprovalDialog(CARRIER_NAME); // Simulate user clicking on dismissal in the dialog. @@ -1717,6 +1703,45 @@ public class WifiCarrierInfoManagerTest extends WifiBaseTest { WifiCarrierInfoManager.ACTION_USER_DISMISS, true); } + @Test + public void testSendImsiProtectionExemptionDialogWithUserAllowed() { + // Setup carrier without IMSI privacy protection + when(mCarrierConfigManager.getConfigForSubId(DATA_SUBID)) + .thenReturn(generateTestCarrierConfig(false)); + ArgumentCaptor receiver = + ArgumentCaptor.forClass(BroadcastReceiver.class); + verify(mContext).registerReceiver(receiver.capture(), any(IntentFilter.class)); + + receiver.getValue().onReceive(mContext, + new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)); + assertFalse(mWifiCarrierInfoManager.requiresImsiEncryption(DATA_SUBID)); + + mWifiCarrierInfoManager.sendImsiProtectionExemptionNotificationIfRequired(DATA_CARRIER_ID); + validateImsiProtectionNotification(CARRIER_NAME); + // Simulate user clicking on the notification. + sendBroadcastForUserActionOnImsi(NOTIFICATION_USER_CLICKED_INTENT_ACTION, + CARRIER_NAME, DATA_CARRIER_ID); + verify(mNotificationManger).cancel(SystemMessage.NOTE_NETWORK_SUGGESTION_AVAILABLE); + validateUserApprovalDialog(CARRIER_NAME); + + // Simulate user clicking on allow in the dialog. + ArgumentCaptor clickListenerCaptor = + ArgumentCaptor.forClass(DialogInterface.OnClickListener.class); + verify(mAlertDialogBuilder, atLeastOnce()).setPositiveButton( + any(), clickListenerCaptor.capture()); + assertNotNull(clickListenerCaptor.getValue()); + clickListenerCaptor.getValue().onClick(mAlertDialog, 0); + mLooper.dispatchAll(); + ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); + verify(mContext).sendBroadcast(intentCaptor.capture()); + assertEquals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, intentCaptor.getValue().getAction()); + verify(mWifiConfigManager).saveToStore(true); + assertTrue(mImsiDataSource.hasNewDataToSerialize()); + verify(mListener).onUserAllowed(DATA_CARRIER_ID); + verify(mWifiMetrics).addUserApprovalCarrierUiReaction( + WifiCarrierInfoManager.ACTION_USER_ALLOWED_CARRIER, true); + } + @Test public void testUserDataStoreIsNotLoadedNotificationWillNotBeSent() { // reset data source to unloaded state. -- cgit v1.2.3