summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Morales <anmorales@google.com>2015-02-04 14:27:45 -0800
committerAndres Morales <anmorales@google.com>2015-02-04 14:29:59 -0800
commit15d2dfc3d29674835402d67f34b99de79e57e900 (patch)
tree93a09fa5c945ce7864d3e0be42ecb7283698bf06
parent15c963a88c7cd2252953aab8d18b4695ae789a19 (diff)
downloadandroid_packages_apps_Nfc-15d2dfc3d29674835402d67f34b99de79e57e900.tar.gz
android_packages_apps_Nfc-15d2dfc3d29674835402d67f34b99de79e57e900.tar.bz2
android_packages_apps_Nfc-15d2dfc3d29674835402d67f34b99de79e57e900.zip
Re-add quotes for network key and ssid
Otherwise the wpa_supplicant does not interpret them properly Bug:18958216 Change-Id: I1c05190e745819f4f0e768206afae147124a3616
-rw-r--r--src/com/android/nfc/NfcWifiProtectedSetup.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcWifiProtectedSetup.java b/src/com/android/nfc/NfcWifiProtectedSetup.java
index 0b425d1d..dbd22b79 100644
--- a/src/com/android/nfc/NfcWifiProtectedSetup.java
+++ b/src/com/android/nfc/NfcWifiProtectedSetup.java
@@ -125,7 +125,7 @@ public final class NfcWifiProtectedSetup {
case SSID_FIELD_ID:
byte[] ssid = new byte[fieldSize];
payload.get(ssid);
- result.SSID = new String(ssid);
+ result.SSID = "\"" + new String(ssid) + "\"";
break;
case NETWORK_KEY_FIELD_ID:
if (fieldSize > MAX_NETWORK_KEY_SIZE_BYTES) {
@@ -133,7 +133,7 @@ public final class NfcWifiProtectedSetup {
}
byte[] networkKey = new byte[fieldSize];
payload.get(networkKey);
- result.preSharedKey = new String(networkKey);
+ result.preSharedKey = "\"" + new String(networkKey) + "\"";
break;
case AUTH_TYPE_FIELD_ID:
if (fieldSize != AUTH_TYPE_EXPECTED_SIZE) {