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

Merge "Still more debugging for bug 19823482"

Browse Source
This commit is contained in:
Craig Mautner
2015-03-29 23:49:56 +00:00
committed by Android (Google) Code Review
parent ebf750bc9b 7258118c06
commit 8501866d74
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -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),

3
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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.