summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2011-05-08 22:38:02 -0700
committerThe Android Automerger <android-build@android.com>2011-05-08 22:38:02 -0700
commit44e39d608cfddcbf56123480123822f26f20f259 (patch)
tree92f2c670cfe195d1b422af904e98ab95393c78b2 /core
parent5de8226cc7caea7a52d9f2538f87d2cc34214ad0 (diff)
parent158e3582c03ab9e0221718da20fc8854bb9216d0 (diff)
downloadframeworks_base-44e39d608cfddcbf56123480123822f26f20f259.zip
frameworks_base-44e39d608cfddcbf56123480123822f26f20f259.tar.gz
frameworks_base-44e39d608cfddcbf56123480123822f26f20f259.tar.bz2
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
Diffstat (limited to 'core')
-rw-r--r--core/java/android/webkit/HTML5VideoViewProxy.java4
-rw-r--r--core/jni/android_net_wifi_Wifi.cpp4
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;
}