Merge "Avoid sending false orientation event to webkit." (10186c45) · Commits · e / os / android_frameworks_base

core/java/android/webkit/BrowserFrame.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ class BrowserFrame extends Handler {
		// that if the UI thread posts any messages after the message
		// queue has been cleared,they are ignored.
		private boolean mBlockMessages = false;

		private int mOrientation;
		private static String sDatabaseDirectory;
		private static String sCacheDirectory;

		@@ -225,6 +225,7 @@ class BrowserFrame extends Handler {
		mCallbackProxy = proxy;
		mDatabase = WebViewDatabase.getInstance(appContext);
		mWebViewCore = w;
		mOrientation = 0;

		AssetManager am = context.getAssets();
		nativeCreateFrame(w, am, proxy.getBackForwardList());
		@@ -497,7 +498,10 @@ class BrowserFrame extends Handler {
		}

		case ORIENTATION_CHANGED: {
		if (mOrientation != msg.arg1) {
		mOrientation = msg.arg1;
		nativeOrientationChanged(msg.arg1);
		}
		break;
		}