Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE

Browse Source
This commit is contained in:
The Android Automerger
2011-05-08 22:38:02 -07:00
parent 5de8226cc7 158e3582c0
commit 44e39d608c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/HTML5VideoViewProxy.java
View File

@@ -184,7 +184,9 @@ class HTML5VideoViewProxy extends Handler
// we need to pause the old one and re-create a new media player // we need to pause the old one and re-create a new media player
// inside the HTML5VideoView. // inside the HTML5VideoView.
if (mHTML5VideoView != null) { if (mHTML5VideoView != null) {
if (!backFromFullScreenMode) {
mHTML5VideoView.pauseAndDispatch(mCurrentProxy); mHTML5VideoView.pauseAndDispatch(mCurrentProxy);
}
// release the media player to avoid finalize error // release the media player to avoid finalize error
mHTML5VideoView.release(); mHTML5VideoView.release();
} }

4
core/jni/android_net_wifi_Wifi.cpp
View File

@@ -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 // reply comes back in the form "powermode = XX" where XX is the
// number we're interested in. // number we're interested in.
sscanf(reply, "%*s = %u", &power); if (sscanf(reply, "%*s = %u", &power) != 1) {
return (jint)-1;
}
return (jint)power; return (jint)power;
} }