Merge "Fix escaping of characters" into froyo (9ecca85f) · Commits · e / os / android_frameworks_base

services/java/com/android/server/NetworkManagementService.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -494,15 +494,20 @@ class NetworkManagementService extends INetworkManagementService.Stub {
		* argv8 - Max SCB
		*/
		String str = String.format("softap set " + wlanIface + " " + softapIface +
		" \"%s\" %s %s", wifiConfig.SSID,
		" %s %s %s", convertQuotedString(wifiConfig.SSID),
		wifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
		"wpa2-psk" : "open",
		wifiConfig.preSharedKey);
		convertQuotedString(wifiConfig.preSharedKey));
		mConnector.doCommand(str);
		}
		mConnector.doCommand(String.format("softap startap"));
		}

		private String convertQuotedString(String s) {
		/* Replace \ with \\, then " with \" and add quotes at end */
		return '"' + s.replaceAll("\\\\","\\\\\\\\").replaceAll("\"","\\\\\"") + '"';
		}

		public void stopAccessPoint() throws IllegalStateException {
		mContext.enforceCallingOrSelfPermission(
		android.Manifest.permission.CHANGE_NETWORK_STATE, "NetworkManagementService");
		@@ -521,10 +526,10 @@ class NetworkManagementService extends INetworkManagementService.Stub {
		mConnector.doCommand(String.format("softap set " + wlanIface + " " + softapIface));
		} else {
		String str = String.format("softap set " + wlanIface + " " + softapIface +
		" \"%s\" %s %s", wifiConfig.SSID,
		" %s %s %s", convertQuotedString(wifiConfig.SSID),
		wifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
		"wpa2-psk" : "open",
		wifiConfig.preSharedKey);
		convertQuotedString(wifiConfig.preSharedKey));
		mConnector.doCommand(str);
		}
		}