diff options
| -rw-r--r-- | core/java/android/webkit/HTML5VideoViewProxy.java | 4 | ||||
| -rw-r--r-- | core/jni/android_net_wifi_Wifi.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java index 060c0bb..d1b8cfc 100644 --- a/core/java/android/webkit/HTML5VideoViewProxy.java +++ b/core/java/android/webkit/HTML5VideoViewProxy.java @@ -184,7 +184,9 @@ class HTML5VideoViewProxy extends Handler // we need to pause the old one and re-create a new media player // inside the HTML5VideoView. if (mHTML5VideoView != null) { - mHTML5VideoView.pauseAndDispatch(mCurrentProxy); + if (!backFromFullScreenMode) { + mHTML5VideoView.pauseAndDispatch(mCurrentProxy); + } // release the media player to avoid finalize error mHTML5VideoView.release(); } diff --git a/core/jni/android_net_wifi_Wifi.cpp b/core/jni/android_net_wifi_Wifi.cpp index 667ba75..4e363bf 100644 --- a/core/jni/android_net_wifi_Wifi.cpp +++ b/core/jni/android_net_wifi_Wifi.cpp @@ -459,7 +459,9 @@ static jint android_net_wifi_getPowerModeCommand(JNIEnv* env, jobject clazz) } // 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; } |