Merge "[WifiDialog] "Add network" return WifiConfig"

This commit is contained in:
Maurice Lam
2015-10-28 17:32:03 +00:00
committed by Android (Google) Code Review

View File

@@ -36,6 +36,7 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
private static final int RESULT_FORGET = RESULT_FIRST_USER + 1;
private static final String KEY_ACCESS_POINT_STATE = "access_point_state";
private static final String KEY_WIFI_CONFIGURATION = "wifi_configuration";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -110,6 +111,9 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
accessPoint.saveWifiState(accessPointState);
resultData.putExtra(KEY_ACCESS_POINT_STATE, accessPointState);
}
if (config != null) {
resultData.putExtra(KEY_WIFI_CONFIGURATION, config);
}
setResult(RESULT_CONNECTED, resultData);
finish();
}