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

Merge "DO NOT MERGE: Properly set FLAG_ACTIVITY_BROUGHT_TO_FRONT for onNewIntent() callback" into cw-f-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-30 03:09:20 +00:00
committed by Android (Google) Code Review
parent 492f5263a4 f73d085395
commit 75bf81458e
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1077,6 +1077,10 @@ class ActivityStarter {
top.task.setIntent(mStartActivity); top.task.setIntent(mStartActivity);
} }
ActivityStack.logStartActivity(AM_NEW_INTENT, mStartActivity, top.task); ActivityStack.logStartActivity(AM_NEW_INTENT, mStartActivity, top.task);
if (shouldActivityBeBroughtToFront(mReusedActivity)) {
mStartActivity.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
}
top.deliverNewIntentLocked(mCallingUid, mStartActivity.intent, top.deliverNewIntentLocked(mCallingUid, mStartActivity.intent,
mStartActivity.launchedFromPackage); mStartActivity.launchedFromPackage);
} }
@@ -1509,6 +1513,16 @@ class ActivityStarter {
return intentActivity; return intentActivity;
} }
private boolean shouldActivityBeBroughtToFront(ActivityRecord intentActivity) {
final ActivityStack focusStack = mSupervisor.getFocusedStack();
ActivityRecord curTop = (focusStack == null)
? null : focusStack.topRunningNonDelayedActivityLocked(mNotTop);
return curTop != null
&& (curTop.task != intentActivity.task || curTop.task != focusStack.topTask())
&& !mAvoidMoveToFront;
}
private ActivityRecord setTargetStackAndMoveToFrontIfNeeded(ActivityRecord intentActivity) { private ActivityRecord setTargetStackAndMoveToFrontIfNeeded(ActivityRecord intentActivity) {
mTargetStack = intentActivity.task.stack; mTargetStack = intentActivity.task.stack;
mTargetStack.mLastPausedActivity = null; mTargetStack.mLastPausedActivity = null;
@@ -1517,13 +1531,8 @@ class ActivityStarter {
// the same behavior as if a new instance was being started, which means not bringing it // the same behavior as if a new instance was being started, which means not bringing it
// to the front if the caller is not itself in the front. // to the front if the caller is not itself in the front.
final ActivityStack focusStack = mSupervisor.getFocusedStack(); final ActivityStack focusStack = mSupervisor.getFocusedStack();
ActivityRecord curTop = (focusStack == null)
? null : focusStack.topRunningNonDelayedActivityLocked(mNotTop);
if (curTop != null if (shouldActivityBeBroughtToFront(intentActivity)) {
&& (curTop.task != intentActivity.task || curTop.task != focusStack.topTask())
&& !mAvoidMoveToFront) {
mStartActivity.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
if (mSourceRecord == null || (mSourceStack.topActivity() != null && if (mSourceRecord == null || (mSourceStack.topActivity() != null &&
mSourceStack.topActivity().task == mSourceRecord.task)) { mSourceStack.topActivity().task == mSourceRecord.task)) {
// We really do want to push this one into the user's face, right now. // We really do want to push this one into the user's face, right now.