diff options
| author | Zheng BaoZhong <bao-zhong@motorola.com> | 2009-10-13 16:59:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-13 16:59:28 -0700 |
| commit | 416dd8e60aa57acaa868761cedce883358ae31d0 (patch) | |
| tree | df257d634a465c83c499ba8c91b4c6c1cc39b769 /core | |
| parent | edd3d917af91ab4189d6947ed461630c490dc0d9 (diff) | |
| parent | 360f21cdfccb5039cabb3c519b6b9b598aec1dca (diff) | |
| download | frameworks_base-416dd8e60aa57acaa868761cedce883358ae31d0.zip frameworks_base-416dd8e60aa57acaa868761cedce883358ae31d0.tar.gz frameworks_base-416dd8e60aa57acaa868761cedce883358ae31d0.tar.bz2 | |
am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2
Merge commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca'
* commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca':
Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_net_wifi_Wifi.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/android_net_wifi_Wifi.cpp b/core/jni/android_net_wifi_Wifi.cpp index 38f3fda..46000c9 100644 --- a/core/jni/android_net_wifi_Wifi.cpp +++ b/core/jni/android_net_wifi_Wifi.cpp @@ -20,6 +20,7 @@ #include <utils/misc.h> #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> +#include <utils/String16.h> #include "wifi.h" @@ -92,7 +93,8 @@ static jstring doStringCommand(JNIEnv *env, const char *cmd) if (doCommand(cmd, reply, sizeof(reply)) != 0) { return env->NewStringUTF(NULL); } else { - return env->NewStringUTF(reply); + String16 str((char *)reply); + return env->NewString((const jchar *)str.string(), str.size()); } } |