PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Maurice Lam
2015-10-28 17:32:03 +00:00
committed by Android (Google) Code Review
parent bf933b9684 30b3287eb5
commit a36ac2a772
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/WifiDialogActivity.java
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 int RESULT_FORGET = RESULT_FIRST_USER + 1;
private static final String KEY_ACCESS_POINT_STATE = "access_point_state"; private static final String KEY_ACCESS_POINT_STATE = "access_point_state";
private static final String KEY_WIFI_CONFIGURATION = "wifi_configuration";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -110,6 +111,9 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
accessPoint.saveWifiState(accessPointState); accessPoint.saveWifiState(accessPointState);
resultData.putExtra(KEY_ACCESS_POINT_STATE, accessPointState); resultData.putExtra(KEY_ACCESS_POINT_STATE, accessPointState);
} }
if (config != null) {
resultData.putExtra(KEY_WIFI_CONFIGURATION, config);
}
setResult(RESULT_CONNECTED, resultData); setResult(RESULT_CONNECTED, resultData);
finish(); finish();
} }