am 0fa4d30b: Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev (b0222bb1) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -4403,12 +4403,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		pw.print(prefix); pw.print("mLidKeyboardAccessibility=");
		pw.print(mLidKeyboardAccessibility);
		pw.print(" mLidNavigationAccessibility="); pw.print(mLidNavigationAccessibility);
		pw.print(" mLidControlsSleep="); pw.print(mLidControlsSleep);
		pw.print(" mLongPressOnPowerBehavior="); pw.println(mLongPressOnPowerBehavior);
		pw.print(" mLidControlsSleep="); pw.println(mLidControlsSleep);
		pw.print(prefix); pw.print("mLongPressOnPowerBehavior=");
		pw.print(mLongPressOnPowerBehavior);
		pw.print(" mHasSoftInput="); pw.println(mHasSoftInput);
		pw.print(prefix); pw.print("mScreenOnEarly="); pw.print(mScreenOnEarly);
		pw.print(" mScreenOnFully="); pw.print(mScreenOnFully);
		pw.print(" mOrientationSensorEnabled="); pw.print(mOrientationSensorEnabled);
		pw.print(" mHasSoftInput="); pw.println(mHasSoftInput);
		pw.print(" mOrientationSensorEnabled="); pw.println(mOrientationSensorEnabled);
		pw.print(prefix); pw.print("mUnrestrictedScreen=("); pw.print(mUnrestrictedScreenLeft);
		pw.print(","); pw.print(mUnrestrictedScreenTop);
		pw.print(") "); pw.print(mUnrestrictedScreenWidth);

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

+16 −13

Original line number	Diff line number	Diff line
		@@ -9542,6 +9542,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		}
		}
		if (mOpeningApps.size() > 0 \|\| mClosingApps.size() > 0) {
		pw.println();
		if (mOpeningApps.size() > 0) {
		pw.print(" mOpeningApps="); pw.println(mOpeningApps);
		@@ -9550,6 +9551,7 @@ public class WindowManagerService extends IWindowManager.Stub
		pw.print(" mClosingApps="); pw.println(mClosingApps);
		}
		}
		}

		void dumpSessionsLocked(PrintWriter pw, boolean dumpAll) {
		pw.println("WINDOW MANAGER SESSIONS (dumpsys window sessions)");
		@@ -9803,7 +9805,7 @@ public class WindowManagerService extends IWindowManager.Stub
		pw.println(mNextAppTransitionCallback);
		}
		pw.print(" mStartingIconInTransition="); pw.print(mStartingIconInTransition);
		pw.print(", mSkipAppTransitionAnimation="); pw.println(mSkipAppTransitionAnimation);
		pw.print(" mSkipAppTransitionAnimation="); pw.println(mSkipAppTransitionAnimation);
		}
		}

		@@ -9971,30 +9973,31 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		synchronized(mWindowMap) {
		pw.println();
		if (dumpAll) {
		pw.println("-------------------------------------------------------------------------------");
		}
		dumpPolicyLocked(pw, args, dumpAll);
		dumpLastANRLocked(pw);
		pw.println();
		if (dumpAll) {
		pw.println("-------------------------------------------------------------------------------");
		}
		dumpSessionsLocked(pw, dumpAll);
		dumpPolicyLocked(pw, args, dumpAll);
		pw.println();
		if (dumpAll) {
		pw.println("-------------------------------------------------------------------------------");
		}
		dumpTokensLocked(pw, dumpAll);
		dumpSessionsLocked(pw, dumpAll);
		pw.println();
		if (dumpAll) {
		pw.println("-------------------------------------------------------------------------------");
		}
		dumpWindowsLocked(pw, dumpAll, null);
		dumpTokensLocked(pw, dumpAll);
		pw.println();
		if (dumpAll) {
		pw.println("-------------------------------------------------------------------------------");
		}
		dumpLastANRLocked(pw);
		dumpWindowsLocked(pw, dumpAll, null);
		}
		}

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

+22 −0

Original line number	Diff line number	Diff line
		@@ -718,6 +718,28 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		\|\| ((mAppToken != null) && (mAppToken.mAppAnimator.animation != null)));
		}

		/**
		* Like isReadyForDisplay(), but ignores any force hiding of the window due
		* to the keyguard.
		*/
		boolean isReadyForDisplayIgnoringKeyguard() {
		if (mRootToken.waitingToShow &&
		mService.mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {
		return false;
		}
		final AppWindowToken atoken = mAppToken;
		if (atoken == null && !mPolicyVisibility) {
		// If this is not an app window, and the policy has asked to force
		// hide, then we really do want to hide.
		return false;
		}
		return mHasSurface && !mDestroying
		&& ((!mAttachedHidden && mViewVisibility == View.VISIBLE
		&& !mRootToken.hidden)
		\|\| mWinAnimator.mAnimation != null
		\|\| ((atoken != null) && (atoken.mAppAnimator.animation != null)));
		}

		/**
		* Like isOnScreen, but returns false if the surface hasn't yet
		* been drawn.

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1218,10 +1218,10 @@ class WindowStateAnimator {
		}
		Slog.v(TAG, "performShow on " + this
		+ ": mDrawState=" + mDrawState + " readyForDisplay="
		+ mWin.isReadyForDisplay()
		+ mWin.isReadyForDisplayIgnoringKeyguard()
		+ " starting=" + (mWin.mAttrs.type == TYPE_APPLICATION_STARTING), e);
		}
		if (mDrawState == READY_TO_SHOW && mWin.isReadyForDisplay()) {
		if (mDrawState == READY_TO_SHOW && mWin.isReadyForDisplayIgnoringKeyguard()) {
		if (SHOW_TRANSACTIONS \|\| DEBUG_ORIENTATION)
		WindowManagerService.logSurface(mWin, "SHOW (performShowLocked)", null);
		if (DEBUG_VISIBILITY) Slog.v(TAG, "Showing " + this