Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add debug to help with b/7135184.

Browse Source 
Change-Id: I0d3b60b3e123d35bd557d47e3344ebea1964380b

Conflicts:

	services/java/com/android/server/wm/WindowAnimator.java
This commit is contained in:
Craig Mautner
2012-09-17 10:37:29 -07:00
parent cc5dd18d15
commit 178af5948d
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
services/java/com/android/server/wm/WindowAnimator.java
View File

@@ -101,6 +101,23 @@ public class WindowAnimator {
boolean mInitialized = false; boolean mInitialized = false;
// forceHiding states.
static final int KEYGUARD_NOT_SHOWN = 0;
static final int KEYGUARD_ANIMATING_IN = 1;
static final int KEYGUARD_SHOWN = 2;
static final int KEYGUARD_ANIMATING_OUT = 3;
int mForceHiding = KEYGUARD_NOT_SHOWN;
private String forceHidingToString() {
switch (mForceHiding) {
case KEYGUARD_NOT_SHOWN: return "KEYGUARD_NOT_SHOWN";
case KEYGUARD_ANIMATING_IN: return "KEYGUARD_ANIMATING_IN";
case KEYGUARD_SHOWN: return "KEYGUARD_SHOWN";
case KEYGUARD_ANIMATING_OUT:return "KEYGUARD_ANIMATING_OUT";
default: return "KEYGUARD STATE UNKNOWN " + mForceHiding;
}
}
WindowAnimator(final WindowManagerService service) { WindowAnimator(final WindowManagerService service) {
mService = service; mService = service;
mContext = service.mContext; mContext = service.mContext;
@@ -280,13 +297,7 @@ public class WindowAnimator {
getDisplayContentsAnimatorLocked(displayId).mWinAnimators; getDisplayContentsAnimatorLocked(displayId).mWinAnimators;
ArrayList<WindowStateAnimator> unForceHiding = null; ArrayList<WindowStateAnimator> unForceHiding = null;
boolean wallpaperInUnForceHiding = false; boolean wallpaperInUnForceHiding = false;
mForceHiding = KEYGUARD_NOT_SHOWN;
// forceHiding states.
final int KEYGUARD_NOT_SHOWN = 0;
final int KEYGUARD_ANIMATING_IN = 1;
final int KEYGUARD_SHOWN = 2;
final int KEYGUARD_ANIMATING_OUT = 3;
int forceHiding = KEYGUARD_NOT_SHOWN;
for (int i = winAnimatorList.size() - 1; i >= 0; i--) { for (int i = winAnimatorList.size() - 1; i >= 0; i--) {
WindowStateAnimator winAnimator = winAnimatorList.get(i); WindowStateAnimator winAnimator = winAnimatorList.get(i);
@@ -329,16 +340,16 @@ public class WindowAnimator {
if (win.isReadyForDisplay()) { if (win.isReadyForDisplay()) {
if (nowAnimating) { if (nowAnimating) {
if (winAnimator.mAnimationIsEntrance) { if (winAnimator.mAnimationIsEntrance) {
forceHiding = KEYGUARD_ANIMATING_IN; mForceHiding = KEYGUARD_ANIMATING_IN;
} else { } else {
forceHiding = KEYGUARD_ANIMATING_OUT; mForceHiding = KEYGUARD_ANIMATING_OUT;
} }
} else { } else {
forceHiding = KEYGUARD_SHOWN; mForceHiding = KEYGUARD_SHOWN;
} }
} }
if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG, if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,
"Force hide " + forceHiding "Force hide " + mForceHiding
+ " hasSurface=" + win.mHasSurface + " hasSurface=" + win.mHasSurface
+ " policyVis=" + win.mPolicyVisibility + " policyVis=" + win.mPolicyVisibility
+ " destroying=" + win.mDestroying + " destroying=" + win.mDestroying
@@ -350,9 +361,9 @@ public class WindowAnimator {
final boolean hideWhenLocked = final boolean hideWhenLocked =
(winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0; (winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0;
final boolean changed; final boolean changed;
if (((forceHiding == KEYGUARD_ANIMATING_IN) if (((mForceHiding == KEYGUARD_ANIMATING_IN)
&& (!winAnimator.isAnimating() || hideWhenLocked)) && (!winAnimator.isAnimating() || hideWhenLocked))
|| ((forceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) { || ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) {
changed = win.hideLw(false, false); changed = win.hideLw(false, false);
if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG, if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG,
"Now policy hidden: " + win); "Now policy hidden: " + win);
@@ -708,10 +719,11 @@ public class WindowAnimator {
if (dumpAll) { if (dumpAll) {
if (mWindowDetachedWallpaper != null) { if (mWindowDetachedWallpaper != null) {
pw.print(prefix); pw.print("mWindowDetachedWallpaper="); pw.print(prefix); pw.print("mWindowDetachedWallpaper=");
pw.println(mWindowDetachedWallpaper); pw.println(mWindowDetachedWallpaper);
} }
pw.print(prefix); pw.print("mAnimTransactionSequence="); pw.print(prefix); pw.print("mAnimTransactionSequence=");
pw.println(mAnimTransactionSequence); pw.print(mAnimTransactionSequence);
pw.println(" mForceHiding=" + forceHidingToString());
for (int i = 0; i < mDisplayContentsAnimators.size(); i++) { for (int i = 0; i < mDisplayContentsAnimators.size(); i++) {
pw.print(prefix); pw.print("DisplayContentsAnimator #"); pw.print(prefix); pw.print("DisplayContentsAnimator #");
pw.println(mDisplayContentsAnimators.keyAt(i)); pw.println(mDisplayContentsAnimators.keyAt(i));

3
services/java/com/android/server/wm/WindowState.java
View File

@@ -1133,7 +1133,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
pw.print(prefix); pw.print("mConfiguration="); pw.println(mConfiguration); pw.print(prefix); pw.print("mConfiguration="); pw.println(mConfiguration);
} }
pw.print(prefix); pw.print("mHasSurface="); pw.print(mHasSurface); pw.print(prefix); pw.print("mHasSurface="); pw.print(mHasSurface);
pw.print(" mShownFrame="); mShownFrame.printShortString(pw); pw.println(); pw.print(" mShownFrame="); mShownFrame.printShortString(pw);
pw.print(" isReadyForDisplay()="); pw.println(isReadyForDisplay());
if (dumpAll) { if (dumpAll) {
pw.print(prefix); pw.print("mFrame="); mFrame.printShortString(pw); pw.print(prefix); pw.print("mFrame="); mFrame.printShortString(pw);
pw.print(" last="); mLastFrame.printShortString(pw); pw.print(" last="); mLastFrame.printShortString(pw);