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

Merge "Don't set extreme values of Integer to safe bounds" into tm-dev

Browse Source
This commit is contained in:
Tiger Huang
2022-06-07 11:45:29 +00:00
committed by Android (Google) Code Review
parent 0cbdd27570 32dd1b916a
commit 0a194469f0
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/InsetsState.java
View File

@@ -548,7 +548,8 @@ public class InsetsState implements Parcelable {
} }
public void getDisplayCutoutSafe(Rect outBounds) { public void getDisplayCutoutSafe(Rect outBounds) {
outBounds.set(Integer.MIN_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE); outBounds.set(
WindowLayout.MIN_X, WindowLayout.MIN_Y, WindowLayout.MAX_X, WindowLayout.MAX_Y);
final DisplayCutout cutout = mDisplayCutout.get(); final DisplayCutout cutout = mDisplayCutout.get();
final Rect displayFrame = mDisplayFrame; final Rect displayFrame = mDisplayFrame;
if (!cutout.isEmpty()) { if (!cutout.isEmpty()) {

12
core/java/android/view/WindowLayout.java
View File

@@ -54,6 +54,12 @@ public class WindowLayout {
public static final int UNSPECIFIED_LENGTH = -1; public static final int UNSPECIFIED_LENGTH = -1;
/** These coordinates are the borders of the window layout. */
static final int MIN_X = -100000;
static final int MIN_Y = -100000;
static final int MAX_X = 100000;
static final int MAX_Y = 100000;
private final Rect mTempDisplayCutoutSafeExceptMaybeBarsRect = new Rect(); private final Rect mTempDisplayCutoutSafeExceptMaybeBarsRect = new Rect();
private final Rect mTempRect = new Rect(); private final Rect mTempRect = new Rect();
@@ -172,8 +178,10 @@ public class WindowLayout {
// TYPE_SYSTEM_ERROR is above the NavigationBar so it can't be allowed to extend over it. // TYPE_SYSTEM_ERROR is above the NavigationBar so it can't be allowed to extend over it.
// Also, we don't allow windows in multi-window mode to extend out of the screen. // Also, we don't allow windows in multi-window mode to extend out of the screen.
if (noLimits && type != TYPE_SYSTEM_ERROR && !inMultiWindowMode) { if (noLimits && type != TYPE_SYSTEM_ERROR && !inMultiWindowMode) {
outDisplayFrame.left = outDisplayFrame.top = -10000; outDisplayFrame.left = MIN_X;
outDisplayFrame.right = outDisplayFrame.bottom = 10000; outDisplayFrame.top = MIN_Y;
outDisplayFrame.right = MAX_X;
outDisplayFrame.bottom = MAX_Y;
} }
final boolean hasCompatScale = compatScale != 1f; final boolean hasCompatScale = compatScale != 1f;