drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check when determining mOnTopOfHome" into klp-dev

Browse Source
This commit is contained in:
Craig Mautner
2013-10-14 16:38:48 +00:00
committed by Android (Google) Code Review
parent 2261bef330 d99384d067
commit ea7c1e24a2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1629,10 +1629,12 @@ final class ActivityStack {
private void insertTaskAtTop(TaskRecord task) { private void insertTaskAtTop(TaskRecord task) {
// If this is being moved to the top by another activity or being launched from the home // If this is being moved to the top by another activity or being launched from the home
// activity, set mOnTopOfHome accordingly. // activity, set mOnTopOfHome accordingly.
final boolean fromHome = mStackSupervisor.getLastStack().isHomeStack(); ActivityStack lastStack = mStackSupervisor.getLastStack();
final boolean fromHome = lastStack == null ? true : lastStack.isHomeStack();
if (!isHomeStack() && (fromHome || topTask() != task)) { if (!isHomeStack() && (fromHome || topTask() != task)) {
task.mOnTopOfHome = fromHome; task.mOnTopOfHome = fromHome;
} }
mTaskHistory.remove(task); mTaskHistory.remove(task);
// Now put task at top. // Now put task at top.
int stackNdx = mTaskHistory.size(); int stackNdx = mTaskHistory.size();