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

am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2

Browse Source 
* commit 'b5141a9fc7e841167c3e07f8797d8aef9a787d25':
  fix one NPE when webChromeClient don't have progress view support
This commit is contained in:
Teng-Hui Zhu
2011-06-10 14:27:13 -07:00
committed by Android Git Automerger
parent 75612e9c3f b5141a9fc7
commit 5a9bbc34cb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/webkit/HTML5VideoFullScreen.java
View File

@@ -314,10 +314,12 @@ public class HTML5VideoFullScreen extends HTML5VideoView
@Override @Override
protected void switchProgressView(boolean playerBuffering) { protected void switchProgressView(boolean playerBuffering) {
if (playerBuffering) { if (mProgressView != null) {
mProgressView.setVisibility(View.VISIBLE); if (playerBuffering) {
} else { mProgressView.setVisibility(View.VISIBLE);
mProgressView.setVisibility(View.GONE); } else {
mProgressView.setVisibility(View.GONE);
}
} }
return; return;
} }