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

Merge "Don't throw when setting the same windowing mode"

Browse Source
This commit is contained in:
Garfield Tan
2023-01-04 21:15:56 +00:00
committed by Android (Google) Code Review
parent fb0506853c 462b8f5f47
commit 5cd7ef0fd5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -658,7 +658,8 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
}
}
if (windowingMode > -1) {
final int prevWindowingMode = container.getWindowingMode();
if (windowingMode > -1 && prevWindowingMode != windowingMode) {
if (mService.isInLockTaskMode()
&& WindowConfiguration.inMultiWindowMode(windowingMode)) {
throw new UnsupportedOperationException("Not supported to set multi-window"
@@ -672,9 +673,8 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
return effects;
}
final int prevMode = container.getWindowingMode();
container.setWindowingMode(windowingMode);
if (prevMode != container.getWindowingMode()) {
if (prevWindowingMode != container.getWindowingMode()) {
// The activity in the container may become focusable or non-focusable due to
// windowing modes changes (such as entering or leaving pinned windowing mode),
// so also apply the lifecycle effects to this transaction.