Merge "Fix a NPE when forget wifi network" into sc-dev

tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java

@@ -1273,6 +1273,18 @@ public class WifiDetailPreferenceController2Test {
                 Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 1);
     }
 
+    @Test
+    public void forgetNetwork_activityGone_ignoreFinish() {
+        setUpForConnectedNetwork();
+        setUpSpyController();
+        displayAndResume();
+        when(mMockFragment.getActivity()).thenReturn(null);
+
+        mForgetClickListener.getValue().onClick(null);
+
+        verify(mMockActivity, never()).finish();
+    }
+
     @Test
     public void forgetNetwork_standardWifiNetwork_forget() {
         setUpForConnectedNetwork();