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

Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-17 18:02:17 +00:00
committed by Android (Google) Code Review
parent 65ca16ebab 6874114a95
commit 4570df8fd5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2017,6 +2017,9 @@ final class ActivityStack {
void cancelInitializingActivities() { void cancelInitializingActivities() {
final ActivityRecord topActivity = topRunningActivityLocked(); final ActivityRecord topActivity = topRunningActivityLocked();
boolean aboveTop = true; boolean aboveTop = true;
// We don't want to clear starting window for activities that aren't behind fullscreen
// activities as we need to display their starting window until they are done initializing.
boolean behindFullscreenActivity = false;
for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) { for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
final ArrayList<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities; final ArrayList<ActivityRecord> activities = mTaskHistory.get(taskNdx).mActivities;
for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) { for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {
@@ -2025,16 +2028,20 @@ final class ActivityStack {
if (r == topActivity) { if (r == topActivity) {
aboveTop = false; aboveTop = false;
} }
behindFullscreenActivity |= r.fullscreen;
continue; continue;
} }
if (r.state == ActivityState.INITIALIZING if (r.state == ActivityState.INITIALIZING
&& r.mStartingWindowState == STARTING_WINDOW_SHOWN) { && r.mStartingWindowState == STARTING_WINDOW_SHOWN
&& behindFullscreenActivity) {
if (DEBUG_VISIBILITY) Slog.w(TAG_VISIBILITY, if (DEBUG_VISIBILITY) Slog.w(TAG_VISIBILITY,
"Found orphaned starting window " + r); "Found orphaned starting window " + r);
r.mStartingWindowState = STARTING_WINDOW_REMOVED; r.mStartingWindowState = STARTING_WINDOW_REMOVED;
mWindowManager.removeAppStartingWindow(r.appToken); mWindowManager.removeAppStartingWindow(r.appToken);
} }
behindFullscreenActivity |= r.fullscreen;
} }
} }
} }

3
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -1122,7 +1122,8 @@ class ActivityStarter {
} }
final ActivityRecord topTaskActivity = mStartActivity.task.topRunningActivityLocked(); final ActivityRecord topTaskActivity = mStartActivity.task.topRunningActivityLocked();
if (!mTargetStack.isFocusable() if (!mTargetStack.isFocusable()
|| (topTaskActivity != null && topTaskActivity.mTaskOverlay)) { || (topTaskActivity != null && topTaskActivity.mTaskOverlay
&& mStartActivity != topTaskActivity)) {
// If the activity is not focusable, we can't resume it, but still would like to // If the activity is not focusable, we can't resume it, but still would like to
// make sure it becomes visible as it starts (this will also trigger entry // make sure it becomes visible as it starts (this will also trigger entry
// animation). An example of this are PIP activities. // animation). An example of this are PIP activities.