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

am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev

Browse Source 
* commit '21ab13ff743fda1cec1923a8dec6b5553a514759':
  Don't null class member before using it.
This commit is contained in:
Craig Mautner
2014-02-13 19:21:41 +00:00
committed by Android Git Automerger
parent 4dd839756c 21ab13ff74
commit 3816fa8bee
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/wm/TaskStack.java
View File

@@ -367,11 +367,11 @@ public class TaskStack {
(mDisplayContent.mDeferredActions & DisplayContent.DEFER_DETACH) != 0 && (mDisplayContent.mDeferredActions & DisplayContent.DEFER_DETACH) != 0 &&
!isAnimating()) { !isAnimating()) {
mDisplayContent.mDeferredActions &= ~DisplayContent.DEFER_DETACH; mDisplayContent.mDeferredActions &= ~DisplayContent.DEFER_DETACH;
mService.detachStack(mStackId);
if ((mDisplayContent.mDeferredActions & DisplayContent.DEFER_REMOVAL) != 0) { if ((mDisplayContent.mDeferredActions & DisplayContent.DEFER_REMOVAL) != 0) {
mDisplayContent.mDeferredActions &= ~DisplayContent.DEFER_REMOVAL; mDisplayContent.mDeferredActions &= ~DisplayContent.DEFER_REMOVAL;
mService.onDisplayRemoved(mDisplayContent.getDisplayId()); mService.onDisplayRemoved(mDisplayContent.getDisplayId());
} }
mService.detachStack(mStackId);
} }
for (int taskNdx = mTasks.size() - 1; taskNdx >= 0; --taskNdx) { for (int taskNdx = mTasks.size() - 1; taskNdx >= 0; --taskNdx) {
final Task task = mTasks.get(taskNdx); final Task task = mTasks.get(taskNdx);