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

Merge "Deliver new activity options after the activity is made visible" into nyc-dev

Browse Source 
am: e9f5d365bb

* commit 'e9f5d365bb740edade62290d1d835902a58cfdf2':
  Deliver new activity options after the activity is made visible

Change-Id: I8dc17b803f56a47e29518026e6b6e223a0964ff8
This commit is contained in:
Chong Zhang
2016-05-11 22:09:28 +00:00
committed by android-build-merger
parent ac26a7c427 e9f5d365bb
commit 9396f7e64e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1752,6 +1752,9 @@ final class ActivityStack {
} }
} else if (r.visible) { } else if (r.visible) {
// If this activity is already visible, then there is nothing to do here. // If this activity is already visible, then there is nothing to do here.
if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY,
"Skipping: already visible at " + r);
if (handleAlreadyVisible(r)) { if (handleAlreadyVisible(r)) {
resumeNextActivity = false; resumeNextActivity = false;
} }
@@ -1933,8 +1936,6 @@ final class ActivityStack {
r.sleeping = false; r.sleeping = false;
r.app.pendingUiClean = true; r.app.pendingUiClean = true;
r.app.thread.scheduleWindowVisibility(r.appToken, true); r.app.thread.scheduleWindowVisibility(r.appToken, true);
r.stopFreezingScreenLocked(false);
// The activity may be waiting for stop, but that is no longer // The activity may be waiting for stop, but that is no longer
// appropriate for it. // appropriate for it.
mStackSupervisor.mStoppingActivities.remove(r); mStackSupervisor.mStoppingActivities.remove(r);
@@ -1944,10 +1945,10 @@ final class ActivityStack {
// visible when it next restarts. // visible when it next restarts.
Slog.w(TAG, "Exception thrown making visibile: " + r.intent.getComponent(), e); Slog.w(TAG, "Exception thrown making visibile: " + r.intent.getComponent(), e);
} }
handleAlreadyVisible(r);
} }
private boolean handleAlreadyVisible(ActivityRecord r) { private boolean handleAlreadyVisible(ActivityRecord r) {
if (DEBUG_VISIBILITY) Slog.v(TAG_VISIBILITY, "Skipping: already visible at " + r);
r.stopFreezingScreenLocked(false); r.stopFreezingScreenLocked(false);
try { try {
if (r.returningOptions != null) { if (r.returningOptions != null) {