Merge Android 14 QPR1
Merged-In: Id88f6f00a1546ae459f36320b8979627b9767462
Bug: 315507370
Change-Id: I05d081ca29aef7ae112ef058555c16e732f6403e
diff --git a/bridge/src/android/view/WindowManagerImpl.java b/bridge/src/android/view/WindowManagerImpl.java
index e8b9fcf..eb1e22c 100644
--- a/bridge/src/android/view/WindowManagerImpl.java
+++ b/bridge/src/android/view/WindowManagerImpl.java
@@ -272,16 +272,15 @@
private WindowInsets computeWindowInsets() {
try {
final InsetsState insetsState = new InsetsState();
- final boolean alwaysConsumeSystemBars =
- WindowManagerGlobal.getWindowManagerService().getWindowInsets(
- mContext.getDisplayId(), null /* token */, insetsState);
+ WindowManagerGlobal.getWindowManagerService().getWindowInsets(mContext.getDisplayId(),
+ null /* token */, insetsState);
final Configuration config = mContext.getResources().getConfiguration();
final boolean isScreenRound = config.isScreenRound();
- final int windowingMode = config.windowConfiguration.getWindowingMode();
+ final int activityType = config.windowConfiguration.getActivityType();
return insetsState.calculateInsets(getCurrentBounds(mContext),
- null /* ignoringVisibilityState*/, isScreenRound, alwaysConsumeSystemBars,
- SOFT_INPUT_ADJUST_NOTHING, 0, SYSTEM_UI_FLAG_VISIBLE, TYPE_APPLICATION,
- windowingMode, null /* typeSideMap */);
+ null /* ignoringVisibilityState */, isScreenRound, SOFT_INPUT_ADJUST_NOTHING,
+ 0 /* legacySystemUiFlags */, SYSTEM_UI_FLAG_VISIBLE, TYPE_APPLICATION,
+ activityType, null /* typeSideMap */);
} catch (RemoteException ignore) {
}
return null;