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

Merge "Fix issues in Wi-Fi NFC tag code"

Browse Source
This commit is contained in:
Andres Morales
2014-05-15 23:42:40 +00:00
committed by Android (Google) Code Review
parent eac9c273dc ae04155bbe
commit 5fe81c7cc8
4 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -567,7 +567,7 @@ public class WifiSettings extends RestrictedSettingsFragment
if (mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {
// Only allow writing of NFC tags for password-protected networks.
menu.add(Menu.NONE, MENU_ID_WRITE_NFC, 0, "Write to NFC Tag");
menu.add(Menu.NONE, MENU_ID_WRITE_NFC, 0, R.string.wifi_menu_write_to_nfc);
}
}
}
@@ -702,9 +702,11 @@ public class WifiSettings extends RestrictedSettingsFragment
})
.create();
case WRITE_NFC_DIALOG_ID:
mWifiToNfcDialog =new WriteWifiConfigToNfcDialog(
getActivity(), mSelectedAccessPoint, mWifiManager);
return mWifiToNfcDialog;
if (mSelectedAccessPoint != null) {
mWifiToNfcDialog = new WriteWifiConfigToNfcDialog(
getActivity(), mSelectedAccessPoint, mWifiManager);
return mWifiToNfcDialog;
}
}
return super.onCreateDialog(dialogId);