From 669ad67377e953e3ccdfbdd60740ce81428ca1d3 Mon Sep 17 00:00:00 2001
From: Sergey Vasilinets <sergeyv@google.com>
Date: Thu, 7 Feb 2019 13:42:33 +0000
Subject: [PATCH] Disallow reflection on Display.getDisplayInfo and
 Display.displayCutout

Display.getCutout() should be used instead.

Test: N/A
bug: 123769394
Change-Id: Ib714dd71d749027a58f36aedb2f25ceb481ae342
---
 core/java/android/view/Display.java     | 3 ++-
 core/java/android/view/DisplayInfo.java | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index e3a6bd7a69491..49bae280321e2 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -32,6 +32,7 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.hardware.display.DisplayManager;
 import android.hardware.display.DisplayManagerGlobal;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.Process;
@@ -495,7 +496,7 @@ public final class Display {
      * @return True if the display is still valid.
      * @hide
      */
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
     public boolean getDisplayInfo(DisplayInfo outDisplayInfo) {
         synchronized (this) {
             updateDisplayInfoLocked();
diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java
index 43de1f89649cc..8f090369d45f2 100644
--- a/core/java/android/view/DisplayInfo.java
+++ b/core/java/android/view/DisplayInfo.java
@@ -27,6 +27,7 @@ import android.annotation.UnsupportedAppUsage;
 import android.content.res.CompatibilityInfo;
 import android.content.res.Configuration;
 import android.graphics.Rect;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.ArraySet;
@@ -157,8 +158,9 @@ public final class DisplayInfo implements Parcelable {
      *
      * @hide
      */
+    // Remark on @UnsupportedAppUsage: Display.getCutout should be used instead
     @Nullable
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
     public DisplayCutout displayCutout;
 
     /**