Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5c83bba authored by Sergey Vasilinets's avatar Sergey Vasilinets Committed by Android (Google) Code Review
Browse files

Merge "Disallow reflection on Display.getDisplayInfo and Display.displayCutout"

parents e5f0fe1c 669ad673

core/java/android/view/Display.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

core/java/android/view/DisplayInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -158,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;



    /**