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

Commit 018c3dba authored by Danae Savvidi's avatar Danae Savvidi Committed by Android (Google) Code Review
Browse files

Merge "Add @Nullable annotation to getHdrCapabilities" into main

parents 7c6604fa bcc8fc42

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -52559,7 +52559,7 @@ package android.view { 
    method @Nullable public android.hardware.display.DeviceProductInfo getDeviceProductInfo();

    method public int getDisplayId();

    method public int getFlags();

    method public android.view.Display.HdrCapabilities getHdrCapabilities();

    method @Nullable public android.view.Display.HdrCapabilities getHdrCapabilities();

    method public float getHdrSdrRatio();

    method @Deprecated public int getHeight();

    method @FlaggedApi("com.android.server.display.feature.flags.highest_hdr_sdr_ratio_api") public float getHighestHdrSdrRatio();

core/java/android/view/Display.java

+1 −0
Original line number Diff line number Diff line
@@ -1489,6 +1489,7 @@ public final class Display { 
     *

     * @see #isHdr()

     */

    @Nullable

    public HdrCapabilities getHdrCapabilities() {

        synchronized (mLock) {

            updateDisplayInfoLocked();