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

Fix NPE for user aspect ratio button in multi-window

Browse Source 
Fix: 296852036
Test: atest WMShellUnitTests:CompatUIControllerTest

Change-Id: Ie73d4fc8e6127b53d5f934f277a79c6c5bff46cc
This commit is contained in:
Massimo Carli
2023-08-21 14:15:01 +00:00
parent 08497eca4a
commit be59dd4f40
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIController.java
View File

@@ -230,8 +230,10 @@ public class CompatUIController implements OnDisplaysChangedListener,
// The user aspect ratio button should not be handled when a new TaskInfo is
// sent because of a double tap or when in multi-window mode.
if (taskInfo.getWindowingMode() != WINDOWING_MODE_FULLSCREEN) {
mUserAspectRatioSettingsLayout.release();
mUserAspectRatioSettingsLayout = null;
if (mUserAspectRatioSettingsLayout != null) {
mUserAspectRatioSettingsLayout.release();
mUserAspectRatioSettingsLayout = null;
}
return;
}
if (!taskInfo.isFromLetterboxDoubleTap) {