summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/view/Display.java15
-rw-r--r--core/java/android/view/DisplayInfo.java2
3 files changed, 18 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 7787c1bfc355..04a49415f923 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -45940,6 +45940,7 @@ package android.view {
public final class Display {
method public long getAppVsyncOffsetNanos();
+ method public android.view.DisplayCutout getCutout();
method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point);
method public int getDisplayId();
method public int getFlags();
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index 31cfebcc3ae3..20f806624fd0 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -19,6 +19,7 @@ package android.view;
import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_MODE;
import android.annotation.IntDef;
+import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.app.KeyguardManager;
import android.content.res.CompatibilityInfo;
@@ -753,6 +754,20 @@ public final class Display {
return getRotation();
}
+
+ /**
+ * Returns the {@link DisplayCutout}, or {@code null} if there is none.
+ *
+ * @see DisplayCutout
+ */
+ @Nullable
+ public DisplayCutout getCutout() {
+ synchronized (this) {
+ updateDisplayInfoLocked();
+ return mDisplayInfo.displayCutout;
+ }
+ }
+
/**
* Gets the pixel format of the display.
* @return One of the constants defined in {@link android.graphics.PixelFormat}.
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index 913e5924c6a6..2421ba458403 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -22,6 +22,7 @@ import static android.view.DisplayInfoProto.LOGICAL_HEIGHT;
import static android.view.DisplayInfoProto.LOGICAL_WIDTH;
import static android.view.DisplayInfoProto.NAME;
+import android.annotation.Nullable;
import android.content.res.CompatibilityInfo;
import android.content.res.Configuration;
import android.graphics.Rect;
@@ -153,6 +154,7 @@ public final class DisplayInfo implements Parcelable {
*
* @hide
*/
+ @Nullable
public DisplayCutout displayCutout;
/**