Merge "Fix IME window flickering during rotation." into mnc-dev (25d2746b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+6 −12

Original line number	Diff line number	Diff line
		@@ -7139,20 +7139,14 @@ public class WindowManagerService extends IWindowManager.Stub

		public Configuration computeNewConfiguration() {
		synchronized (mWindowMap) {
		if (!mDisplayReady) {
		return null;
		}
		Configuration config = computeNewConfigurationLocked();
		if (mWaitingForConfig) {
		mWaitingForConfig = false;
		mLastFinishedFreezeSource = "new-config";
		performLayoutAndPlaceSurfacesLocked();
		}
		return config;
		return computeNewConfigurationLocked();
		}
		}

		Configuration computeNewConfigurationLocked() {
		private Configuration computeNewConfigurationLocked() {
		if (!mDisplayReady) {
		return null;
		}
		Configuration config = new Configuration();
		config.fontScale = 0;
		computeScreenConfigurationLocked(config);