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

Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked."

Browse Source
This commit is contained in:
Craig Mautner
2014-12-09 16:33:25 +00:00
committed by Gerrit Code Review
parent da30b545f9 4b5a9a09e5
commit f71f5e8957
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2269,7 +2269,7 @@ final class ActivityStack {
// In this case, we want to finish this activity // In this case, we want to finish this activity
// and everything above it, so be sneaky and pretend // and everything above it, so be sneaky and pretend
// like these are all in the reply chain. // like these are all in the reply chain.
end = numActivities - 1; end = activities.size() - 1;
} else if (replyChainEnd < 0) { } else if (replyChainEnd < 0) {
end = i; end = i;
} else { } else {