diff options
| author | Craig Mautner <cmautner@google.com> | 2015-03-29 23:49:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-29 23:50:00 +0000 |
| commit | 8501866d7480da2251fd8ad29fe918cc0c05c451 (patch) | |
| tree | d57d209094b63ac58c0976a1a339be34a0bb86ff | |
| parent | ebf750bc9b31206e95055ba65ad6c5226e7b8a0a (diff) | |
| parent | 7258118c066db8319237a99a73908134adfc619f (diff) | |
| download | frameworks_base-8501866d7480da2251fd8ad29fe918cc0c05c451.zip frameworks_base-8501866d7480da2251fd8ad29fe918cc0c05c451.tar.gz frameworks_base-8501866d7480da2251fd8ad29fe918cc0c05c451.tar.bz2 | |
Merge "Still more debugging for bug 19823482"
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 777d8dc..0eb914b 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -3919,9 +3919,8 @@ final class ActivityStack { mStackSupervisor.removeChildActivityContainers(r); try { - if (DEBUG_SWITCH || DEBUG_STATES) Slog.i(TAG, - (andResume ? "Relaunching to RESUMED " : "Relaunching to PAUSED ") - + r); + if (DEBUG_SWITCH || DEBUG_STATES) Slog.i(TAG, "Moving to " + + (andResume ? "RESUMED" : "PAUSED") + " Relaunching " + r); r.forceNewConfig = false; r.app.thread.scheduleRelaunchActivity(r.appToken, results, newIntents, changes, !andResume, new Configuration(mService.mConfiguration), diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 957eb9e..32bb78e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -4608,8 +4608,7 @@ public class WindowManagerService extends IWindowManager.Stub if (DEBUG_APP_TRANSITIONS || DEBUG_ORIENTATION) Slog.v(TAG, "setAppVisibility(" + token + ", visible=" + visible + "): " + mAppTransition + " hidden=" + wtoken.hidden + " hiddenRequested=" + - wtoken.hiddenRequested, HIDE_STACK_CRAWLS ? - null : new RuntimeException("here").fillInStackTrace()); + wtoken.hiddenRequested + " Callers=" + Debug.getCallers(6)); // If we are preparing an app transition, then delay changing // the visibility of this token until we execute that transition. |