diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-02 05:04:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-02 05:04:07 +0000 |
| commit | 09be37b2d3e66b7d718b0fd0ea9e73ad15493acb (patch) | |
| tree | bf156ed5c10a0034cf5a915115b3fbeea4b7b75e | |
| parent | 164371fb759bad6854570af0fca60d9a01e17235 (diff) | |
| parent | 323f78001d86e626fe2a62e404f893b6cd847b1f (diff) | |
| download | frameworks_base-09be37b2d3e66b7d718b0fd0ea9e73ad15493acb.zip frameworks_base-09be37b2d3e66b7d718b0fd0ea9e73ad15493acb.tar.gz frameworks_base-09be37b2d3e66b7d718b0fd0ea9e73ad15493acb.tar.bz2 | |
Merge "Add debuggging for 10858941." into klp-dev
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 10 | ||||
| -rw-r--r-- | services/java/com/android/server/am/ActivityStackSupervisor.java | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index dd2f4c4..28c87d1 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -978,7 +978,7 @@ final class ActivityStack { */ final boolean ensureActivitiesVisibleLocked(ActivityRecord top, ActivityRecord starting, String onlyThisProcess, int configChanges, boolean forceHomeShown) { - if (DEBUG_VISBILITY) Slog.v( + if (true || DEBUG_VISBILITY) Slog.v( TAG, "ensureActivitiesVisible behind " + top + " configChanges=0x" + Integer.toHexString(configChanges)); @@ -1034,7 +1034,7 @@ final class ActivityStack { r.startFreezingScreenLocked(r.app, configChanges); } if (!r.visible) { - if (DEBUG_VISBILITY) Slog.v( + if (true || DEBUG_VISBILITY) Slog.v( TAG, "Starting and making visible: " + r); mWindowManager.setAppVisibility(r.appToken, true); } @@ -1056,7 +1056,7 @@ final class ActivityStack { if (r.state != ActivityState.RESUMED && r != starting) { // If this activity is paused, tell it // to now show its window. - if (DEBUG_VISBILITY) Slog.v( + if (true || DEBUG_VISBILITY) Slog.v( TAG, "Making visible and scheduling visibility: " + r); try { if (mTranslucentActivityWaiting != null) { @@ -1110,7 +1110,7 @@ final class ActivityStack { // Now for any activities that aren't visible to the user, make // sure they no longer are keeping the screen frozen. if (r.visible) { - if (DEBUG_VISBILITY) Slog.v(TAG, "Making invisible: " + r); + if (true || DEBUG_VISBILITY) Slog.v(TAG, "Making invisible: " + r); r.visible = false; try { mWindowManager.setAppVisibility(r.appToken, false); @@ -2367,7 +2367,7 @@ final class ActivityStack { if (mResumedActivity == r) { boolean endTask = index <= 0; - if (DEBUG_TRANSITION) Slog.v(TAG, + if (DEBUG_VISBILITY || DEBUG_TRANSITION) Slog.v(TAG, "Prepare close transition: finishing " + r); mWindowManager.prepareAppTransition(endTask ? AppTransition.TRANSIT_TASK_CLOSE diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java index 2db67d5..2b69a4e 100644 --- a/services/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/java/com/android/server/am/ActivityStackSupervisor.java @@ -884,6 +884,7 @@ public final class ActivityStackSupervisor { throws RemoteException { r.startFreezingScreenLocked(app, 0); + if (true) Slog.d(TAG, "realStartActivity: setting app visibility true"); mWindowManager.setAppVisibility(r.appToken, true); // schedule launch ticks to collect information about slow apps. @@ -2299,7 +2300,7 @@ public final class ActivityStackSupervisor { final boolean nowVisible = allResumedActivitiesVisible(); for (int i=0; i<N; i++) { ActivityRecord s = mStoppingActivities.get(i); - if (localLOGV) Slog.v(TAG, "Stopping " + s + ": nowVisible=" + if (true || localLOGV) Slog.v(TAG, "Stopping " + s + ": nowVisible=" + nowVisible + " waitingVisible=" + s.waitingVisible + " finishing=" + s.finishing); if (s.waitingVisible && nowVisible) { |