Merge "Fix issue #3153930: orphan window left on screen" into honeycomb (8eca7a1e) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManagerPolicy.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,9 @@ import android.os.IBinder;
		import android.os.LocalPowerManager;
		import android.view.animation.Animation;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;

		/**
		* This interface supplies all UI-specific behavior of the window manager. An
		* instance of it is created by the window manager when it starts up, and allows
		@@ -817,4 +820,15 @@ public interface WindowManagerPolicy {
		* {@link Surface#ROTATION_180}, {@link Surface#ROTATION_270}.
		*/
		public void setUserRotationMode(int mode, int rotation);

		/**
		* Print the WindowManagerPolicy's state into the given stream.
		*
		* @param prefix Text to print at the front of each line.
		* @param fd The raw file descriptor that the dump is being sent to.
		* @param writer The PrintWriter to which you should dump your state. This will be
		* closed for you after you return.
		* @param args additional arguments to the dump request.
		*/
		public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args);
		}

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+68 −0

Original line number	Diff line number	Diff line
		@@ -122,8 +122,10 @@ import android.media.IAudioService;
		import android.media.AudioManager;

		import java.io.File;
		import java.io.FileDescriptor;
		import java.io.FileReader;
		import java.io.IOException;
		import java.io.PrintWriter;
		import java.util.ArrayList;

		/**
		@@ -2808,4 +2810,70 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// disable key repeat when screen is off
		return mScreenOn;
		}

		public void dump(String prefix, FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.print(prefix); pw.print("mSafeMode="); pw.print(mSafeMode);
		pw.print(" mSystemRead="); pw.println(mSystemReady);
		pw.print(prefix); pw.print("mLidOpen="); pw.print(mLidOpen);
		pw.print(" mLidOpenRotation="); pw.print(mLidOpenRotation);
		pw.print(" mHdmiPlugged="); pw.println(mHdmiPlugged);
		pw.print(prefix); pw.print("mUiMode="); pw.print(mUiMode);
		pw.print(" mDockMode="); pw.print(mDockMode);
		pw.print(" mCarDockRotation="); pw.print(mCarDockRotation);
		pw.print(" mDeskDockRotation="); pw.println(mDeskDockRotation);
		pw.print(prefix); pw.print("mUserRotationMode="); pw.print(mUserRotationMode);
		pw.print(" mUserRotation="); pw.print(mUserRotation);
		pw.print("mAllowAllRotations="); pw.println(mAllowAllRotations);
		pw.print(prefix); pw.print("mAccelerometerDefault="); pw.print(mAccelerometerDefault);
		pw.print(" mCurrentAppOrientation="); pw.println(mCurrentAppOrientation);
		pw.print(prefix); pw.print("mCarDockEnablesAccelerometer=");
		pw.print(mCarDockEnablesAccelerometer);
		pw.print(" mDeskDockEnablesAccelerometer=");
		pw.println(mDeskDockEnablesAccelerometer);
		pw.print(prefix); pw.print("mLidKeyboardAccessibility=");
		pw.print(mLidKeyboardAccessibility);
		pw.print(" mLidNavigationAccessibility="); pw.print(mLidNavigationAccessibility);
		pw.print(" mLongPressOnPowerBehavior="); pw.println(mLongPressOnPowerBehavior);
		pw.print(prefix); pw.print("mScreenOn="); pw.print(mScreenOn);
		pw.print(" mOrientationSensorEnabled="); pw.print(mOrientationSensorEnabled);
		pw.print(" mHasSoftInput="); pw.println(mHasSoftInput);
		pw.print(prefix); pw.print("mUnrestrictedScreen=("); pw.print(mUnrestrictedScreenLeft);
		pw.print(","); pw.print(mUnrestrictedScreenTop);
		pw.print(") "); pw.print(mUnrestrictedScreenWidth);
		pw.print("x"); pw.println(mUnrestrictedScreenHeight);
		pw.print(prefix); pw.print("mRestrictedScreen=("); pw.print(mRestrictedScreenLeft);
		pw.print(","); pw.print(mRestrictedScreenTop);
		pw.print(") "); pw.print(mRestrictedScreenWidth);
		pw.print("x"); pw.println(mRestrictedScreenHeight);
		pw.print(prefix); pw.print("mCur=("); pw.print(mCurLeft);
		pw.print(","); pw.print(mCurTop);
		pw.print(")-("); pw.print(mCurRight);
		pw.print(","); pw.print(mCurBottom); pw.println(")");
		pw.print(prefix); pw.print("mContent=("); pw.print(mContentLeft);
		pw.print(","); pw.print(mContentTop);
		pw.print(")-("); pw.print(mContentRight);
		pw.print(","); pw.print(mContentBottom); pw.println(")");
		pw.print(prefix); pw.print("mDock=("); pw.print(mDockLeft);
		pw.print(","); pw.print(mDockTop);
		pw.print(")-("); pw.print(mDockRight);
		pw.print(","); pw.print(mDockBottom); pw.println(")");
		pw.print(prefix); pw.print("mDockLayer="); pw.println(mDockLayer);
		pw.print(prefix); pw.print("mTopFullscreenOpaqueWindowState=");
		pw.println(mTopFullscreenOpaqueWindowState);
		pw.print(prefix); pw.print("mTopIsFullscreen="); pw.print(mTopIsFullscreen);
		pw.print(" mForceStatusBar="); pw.print(mForceStatusBar);
		pw.print(" mHideLockScreen="); pw.println(mHideLockScreen);
		pw.print(prefix); pw.print("mDismissKeyguard="); pw.print(mDismissKeyguard);
		pw.print(" mHomePressed="); pw.println(mHomePressed);
		pw.print(prefix); pw.print("mAllowLockscreenWhenOn="); pw.print(mAllowLockscreenWhenOn);
		pw.print(" mLockScreenTimeout="); pw.print(mLockScreenTimeout);
		pw.print(" mLockScreenTimerActive="); pw.println(mLockScreenTimerActive);
		pw.print(prefix); pw.print("mEndcallBehavior="); pw.print(mEndcallBehavior);
		pw.print(" mIncallPowerBehavior="); pw.print(mIncallPowerBehavior);
		pw.print(" mLongPressOnHomeBehavior="); pw.println(mLongPressOnHomeBehavior);
		pw.print(prefix); pw.print("mLandscapeRotation="); pw.print(mLandscapeRotation);
		pw.print(" mSeascapeRotation="); pw.println(mSeascapeRotation);
		pw.print(prefix); pw.print("mPortraitRotation="); pw.print(mPortraitRotation);
		pw.print(" mUpsideDownRotation="); pw.println(mUpsideDownRotation);
		}
		}

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

+113 −48

File changed.

Preview size limit exceeded, changes collapsed.