Merge "Update landing activity for wrong password notification" into oc-dr1-dev

am: eed767c193

Change-Id: I3d549fc0ea01a1275ef85ed0a4a049a5d96c705c

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java b/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java
index 405ab65c2..74bfdeba5 100644
--- a/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java
@@ -22,13 +22,16 @@ import static org.mockito.Mockito.*;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Resources;
+import android.provider.Settings;
 
 import com.android.internal.notification.SystemNotificationChannels;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -70,6 +73,11 @@ public class WrongPasswordNotifierTest {
                 eq(SystemNotificationChannels.NETWORK_ALERTS))).thenReturn(mNotificationBuilder);
         mWrongPassNotifier.onWrongPasswordError(TEST_SSID);
         verify(mNotificationManager).notify(eq(WrongPasswordNotifier.NOTIFICATION_ID), any());
+        ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
+        verify(mFrameworkFacade).getActivity(
+                any(Context.class), anyInt(), intent.capture(), anyInt());
+        assertEquals(Settings.ACTION_WIFI_SETTINGS, intent.getValue().getAction());
+        assertEquals(TEST_SSID, intent.getValue().getStringExtra("wifi_start_connect_ssid"));
     }
 
     /**