From a4904791bfe9c40e29a6c9ce28d71aa9851e0686 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Thu, 31 May 2018 19:48:39 +0200
Subject: DisplayCutout: make cutout info available on Display object

Change-Id: I2e00f6b4966b61a0561ae0adf3a74f8ff3df8028
Fixes: 79205749
Test: m check-api
---
 core/java/android/view/Display.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'core/java/android/view/Display.java')

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}.
-- 
cgit v1.2.3