Merge "Fix a NPE if the Chrome Client is not setup" (3159886e) · Commits · e / os / android_frameworks_base

core/java/android/webkit/HTML5VideoFullScreen.java

+12 −11

Original line number	Original line	Diff line number	Diff line
	@@ -253,6 +253,7 @@ public class HTML5VideoFullScreen extends HTML5VideoView
	mLayout.setVisibility(View.VISIBLE);		mLayout.setVisibility(View.VISIBLE);

	WebChromeClient client = webView.getWebChromeClient();		WebChromeClient client = webView.getWebChromeClient();
			if (client != null) {
	client.onShowCustomView(mLayout, mCallback);		client.onShowCustomView(mLayout, mCallback);
	// Plugins like Flash will draw over the video so hide		// Plugins like Flash will draw over the video so hide
	// them while we're playing.		// them while we're playing.
	@@ -264,7 +265,7 @@ public class HTML5VideoFullScreen extends HTML5VideoView
	mLayout.addView(mProgressView, layoutParams);		mLayout.addView(mProgressView, layoutParams);
	mProgressView.setVisibility(View.VISIBLE);		mProgressView.setVisibility(View.VISIBLE);
	}		}
			}
	}		}

	/**		/**