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

Merge "resolved conflicts for merge of 4849aa86 to master"

Browse Source
This commit is contained in:
Chad Jones
2014-06-13 00:46:55 +00:00
committed by Android (Google) Code Review
parent b1768e398f f391ebccea
commit 28b8434a00
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -2888,16 +2888,19 @@ public final class ActivityStackSupervisor implements DisplayListener {
@Override
public void onDisplayAdded(int displayId) {
Slog.v(TAG, "Display added displayId=" + displayId);
mHandler.sendMessage(mHandler.obtainMessage(HANDLE_DISPLAY_ADDED, displayId, 0));
}
@Override
public void onDisplayRemoved(int displayId) {
Slog.v(TAG, "Display removed displayId=" + displayId);
mHandler.sendMessage(mHandler.obtainMessage(HANDLE_DISPLAY_REMOVED, displayId, 0));
}
@Override
public void onDisplayChanged(int displayId) {
Slog.v(TAG, "Display changed displayId=" + displayId);
mHandler.sendMessage(mHandler.obtainMessage(HANDLE_DISPLAY_CHANGED, displayId, 0));
}
@@ -3226,10 +3229,17 @@ public final class ActivityStackSupervisor implements DisplayListener {
return;
}
mContainerState = CONTAINER_STATE_FINISHING;
final Message msg =
mHandler.obtainMessage(CONTAINER_TASK_LIST_EMPTY_TIMEOUT, this);
mHandler.sendMessageDelayed(msg, 1000);
mStack.finishAllActivitiesLocked();
long origId = Binder.clearCallingIdentity();
try {
mStack.finishAllActivitiesLocked();
} finally {
Binder.restoreCallingIdentity(origId);
}
}
}

7
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -728,8 +728,11 @@ final class WindowState implements WindowManagerPolicy.WindowState {
}
public DisplayContent getDisplayContent() {
return mAppToken == null || mNotOnAppsDisplay ?
mDisplayContent : getStack().getDisplayContent();
if (mAppToken == null || mNotOnAppsDisplay) {
return mDisplayContent;
}
final TaskStack stack = getStack();
return stack == null ? mDisplayContent : stack.getDisplayContent();
}
public int getDisplayId() {