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

Merge "Add debuggging for 10858941." into klp-dev

Browse Source
This commit is contained in:
Craig Mautner
2013-10-02 05:04:07 +00:00
committed by Android (Google) Code Review
parent 164371fb75 323f78001d
commit 09be37b2d3
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/am/ActivityStack.java
View File

@@ -978,7 +978,7 @@ final class ActivityStack {
*/ */
final boolean ensureActivitiesVisibleLocked(ActivityRecord top, ActivityRecord starting, final boolean ensureActivitiesVisibleLocked(ActivityRecord top, ActivityRecord starting,
String onlyThisProcess, int configChanges, boolean forceHomeShown) { String onlyThisProcess, int configChanges, boolean forceHomeShown) {
if (DEBUG_VISBILITY) Slog.v( if (true || DEBUG_VISBILITY) Slog.v(
TAG, "ensureActivitiesVisible behind " + top TAG, "ensureActivitiesVisible behind " + top
+ " configChanges=0x" + Integer.toHexString(configChanges)); + " configChanges=0x" + Integer.toHexString(configChanges));
@@ -1034,7 +1034,7 @@ final class ActivityStack {
r.startFreezingScreenLocked(r.app, configChanges); r.startFreezingScreenLocked(r.app, configChanges);
} }
if (!r.visible) { if (!r.visible) {
if (DEBUG_VISBILITY) Slog.v( if (true || DEBUG_VISBILITY) Slog.v(
TAG, "Starting and making visible: " + r); TAG, "Starting and making visible: " + r);
mWindowManager.setAppVisibility(r.appToken, true); mWindowManager.setAppVisibility(r.appToken, true);
} }
@@ -1056,7 +1056,7 @@ final class ActivityStack {
if (r.state != ActivityState.RESUMED && r != starting) { if (r.state != ActivityState.RESUMED && r != starting) {
// If this activity is paused, tell it // If this activity is paused, tell it
// to now show its window. // to now show its window.
if (DEBUG_VISBILITY) Slog.v( if (true || DEBUG_VISBILITY) Slog.v(
TAG, "Making visible and scheduling visibility: " + r); TAG, "Making visible and scheduling visibility: " + r);
try { try {
if (mTranslucentActivityWaiting != null) { if (mTranslucentActivityWaiting != null) {
@@ -1110,7 +1110,7 @@ final class ActivityStack {
// Now for any activities that aren't visible to the user, make // Now for any activities that aren't visible to the user, make
// sure they no longer are keeping the screen frozen. // sure they no longer are keeping the screen frozen.
if (r.visible) { 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; r.visible = false;
try { try {
mWindowManager.setAppVisibility(r.appToken, false); mWindowManager.setAppVisibility(r.appToken, false);
@@ -2367,7 +2367,7 @@ final class ActivityStack {
if (mResumedActivity == r) { if (mResumedActivity == r) {
boolean endTask = index <= 0; boolean endTask = index <= 0;
if (DEBUG_TRANSITION) Slog.v(TAG, if (DEBUG_VISBILITY || DEBUG_TRANSITION) Slog.v(TAG,
"Prepare close transition: finishing " + r); "Prepare close transition: finishing " + r);
mWindowManager.prepareAppTransition(endTask mWindowManager.prepareAppTransition(endTask
? AppTransition.TRANSIT_TASK_CLOSE ? AppTransition.TRANSIT_TASK_CLOSE

3
services/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -884,6 +884,7 @@ public final class ActivityStackSupervisor {
throws RemoteException { throws RemoteException {
r.startFreezingScreenLocked(app, 0); r.startFreezingScreenLocked(app, 0);
if (true) Slog.d(TAG, "realStartActivity: setting app visibility true");
mWindowManager.setAppVisibility(r.appToken, true); mWindowManager.setAppVisibility(r.appToken, true);
// schedule launch ticks to collect information about slow apps. // schedule launch ticks to collect information about slow apps.
@@ -2299,7 +2300,7 @@ public final class ActivityStackSupervisor {
final boolean nowVisible = allResumedActivitiesVisible(); final boolean nowVisible = allResumedActivitiesVisible();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
ActivityRecord s = mStoppingActivities.get(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 + nowVisible + " waitingVisible=" + s.waitingVisible
+ " finishing=" + s.finishing); + " finishing=" + s.finishing);
if (s.waitingVisible && nowVisible) { if (s.waitingVisible && nowVisible) {