drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I409d9b4a into eclair-mr2

Browse Source 
* changes:
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
This commit is contained in:
Android (Google) Code Review
2009-10-10 16:28:58 -04:00
parent 5d93de7393 038e315cde
commit a4adc7981f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android_net_wifi_Wifi.cpp
View File

@ -20,6 +20,7 @@
#include <utils/misc.h> #include <utils/misc.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <utils/String16.h>
#include "wifi.h" #include "wifi.h"
@ -92,7 +93,8 @@ static jstring doStringCommand(JNIEnv *env, const char *cmd)
if (doCommand(cmd, reply, sizeof(reply)) != 0) { if (doCommand(cmd, reply, sizeof(reply)) != 0) {
return env->NewStringUTF(NULL); return env->NewStringUTF(NULL);
} else { } else {
return env->NewStringUTF(reply); String16 str((char *)reply);
return env->NewString((const jchar *)str.string(), str.size());
} }
} }