Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2 (90bdb69b) · Commits · e / os / android_frameworks_base

core/java/android/webkit/HTML5VideoFullScreen.java

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -314,11 +314,13 @@ public class HTML5VideoFullScreen extends HTML5VideoView

	@Override		@Override
	protected void switchProgressView(boolean playerBuffering) {		protected void switchProgressView(boolean playerBuffering) {
			if (mProgressView != null) {
	if (playerBuffering) {		if (playerBuffering) {
	mProgressView.setVisibility(View.VISIBLE);		mProgressView.setVisibility(View.VISIBLE);
	} else {		} else {
	mProgressView.setVisibility(View.GONE);		mProgressView.setVisibility(View.GONE);
	}		}
			}
	return;		return;
	}		}
	}		}