diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-05-04 21:22:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-04 21:22:29 -0700 |
| commit | 33bf60a3fcab0489077314e845323de2d856af43 (patch) | |
| tree | 6138aa59c7221a6fed57b10b87a1129595b486e5 /core/jni/android_net_wifi_Wifi.cpp | |
| parent | a17de9b493123f0d6e6d0b842150bf29322b7a88 (diff) | |
| parent | 86654eda96b005ea21bfe4d29cd042187e497a8f (diff) | |
| download | frameworks_base-33bf60a3fcab0489077314e845323de2d856af43.zip frameworks_base-33bf60a3fcab0489077314e845323de2d856af43.tar.gz frameworks_base-33bf60a3fcab0489077314e845323de2d856af43.tar.bz2 | |
am 86654eda: am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
* commit '86654eda96b005ea21bfe4d29cd042187e497a8f':
Handle GET_POWER failures
Diffstat (limited to 'core/jni/android_net_wifi_Wifi.cpp')
| -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 9d17fe9..e930c5c 100644 --- a/core/jni/android_net_wifi_Wifi.cpp +++ b/core/jni/android_net_wifi_Wifi.cpp @@ -419,7 +419,9 @@ static jint android_net_wifi_getPowerModeCommand(JNIEnv* env, jobject) } // reply comes back in the form "powermode = XX" where XX is the // number we're interested in. - sscanf(reply, "%*s = %u", &power); + if (sscanf(reply, "%*s = %u", &power) != 1) { + return (jint)-1; + } return (jint)power; } |