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

Merge "Fix black frame in finishing transition" into nyc-dev

Browse Source 
am: cffe389

* commit 'cffe389a22cf3f3d63ec37a591b0d6226e1db99e':
  Fix black frame in finishing transition

Change-Id: I23e2deb5a2e3d6a6b285b327b5c3b0ea48790b37
This commit is contained in:
Chong Zhang
2016-04-22 19:18:47 +00:00
committed by android-build-merger
parent 5c819af18a cffe389a22
commit e9188c77f7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3434,8 +3434,8 @@ final class ActivityStack {
mWindowManager.executeAppTransition(); mWindowManager.executeAppTransition();
mStackSupervisor.mWaitingVisibleActivities.add(r); mStackSupervisor.mWaitingVisibleActivities.add(r);
} }
return finishCurrentActivityLocked(r, return finishCurrentActivityLocked(r, (r.visible || r.nowVisible) ?
r.visible ? FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null; FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null;
} else { } else {
if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Finish waiting for pause of: " + r); if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Finish waiting for pause of: " + r);
} }