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

Merge "DO NOT MERGE Don't send config change when display is removed" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-06 20:08:34 +00:00
committed by Android (Google) Code Review
parent b6238ed540 823af6ed26
commit 98396d2de4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityDisplay.java
View File

@@ -664,6 +664,10 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack>
while (getChildCount() > 0) { while (getChildCount() > 0) {
final ActivityStack stack = getChildAt(0); final ActivityStack stack = getChildAt(0);
if (destroyContentOnRemoval) { if (destroyContentOnRemoval) {
// Override the stack configuration to make it equal to the current applied one, so
// that we don't accidentally report configuration change to activities that are
// going to be finished.
stack.onOverrideConfigurationChanged(stack.getConfiguration());
mSupervisor.moveStackToDisplayLocked(stack.mStackId, DEFAULT_DISPLAY, mSupervisor.moveStackToDisplayLocked(stack.mStackId, DEFAULT_DISPLAY,
false /* onTop */); false /* onTop */);
stack.finishAllActivitiesLocked(true /* immediately */); stack.finishAllActivitiesLocked(true /* immediately */);