Merge "Fix fake display size when rotated." into honeycomb-mr2 (6ad07db7) · Commits · e / os / android_frameworks_base

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

+16 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6498,8 +6498,22 @@ public class WindowManagerService extends IWindowManager.Stub
	}		}
	if (mBaseDisplayWidth < mInitialDisplayWidth		if (mBaseDisplayWidth < mInitialDisplayWidth
	\|\| mBaseDisplayHeight < mInitialDisplayHeight) {		\|\| mBaseDisplayHeight < mInitialDisplayHeight) {
	Rect outer = new Rect(0, 0, mInitialDisplayWidth, mInitialDisplayHeight);		int initW, initH, baseW, baseH;
	Rect inner = new Rect(0, 0, mBaseDisplayWidth, mBaseDisplayHeight);		final boolean rotated = (mRotation == Surface.ROTATION_90
			\|\| mRotation == Surface.ROTATION_270);
			if (rotated) {
			initW = mInitialDisplayHeight;
			initH = mInitialDisplayWidth;
			baseW = mBaseDisplayHeight;
			baseH = mBaseDisplayWidth;
			} else {
			initW = mInitialDisplayWidth;
			initH = mInitialDisplayHeight;
			baseW = mBaseDisplayWidth;
			baseH = mBaseDisplayHeight;
			}
			Rect outer = new Rect(0, 0, initW, initH);
			Rect inner = new Rect(0, 0, baseW, baseH);
	try {		try {
	mBlackFrame = new BlackFrame(mFxSession, outer, inner, MASK_LAYER);		mBlackFrame = new BlackFrame(mFxSession, outer, inner, MASK_LAYER);
	} catch (Surface.OutOfResourcesException e) {		} catch (Surface.OutOfResourcesException e) {