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

Commit 660600f9 authored by Michael Wright's avatar Michael Wright
Browse files

Apply @Display.HdrCapabilities.HdrType to more places. 

This silences the warning that we might not be returning the correct
types from the method that's already annotated.

Bug: 342006701
Test: compiles
Change-Id: I340824fe5f3d026d589d972d29e0795fc2ddd1a8
parent 7cc4b011

services/core/java/com/android/server/display/DisplayManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ public final class DisplayManagerService extends SystemService { 
    private DeviceStateManagerInternal mDeviceStateManager;

    @GuardedBy("mSyncRoot")

    private int[] mUserDisabledHdrTypes = {};

    @Display.HdrCapabilities.HdrType

    private int[] mSupportedHdrOutputType;

    @GuardedBy("mSyncRoot")

    private boolean mAreUserDisabledHdrTypesAllowed = true;
@@ -3438,6 +3439,7 @@ public final class DisplayManagerService extends SystemService { 
                    autoHdrTypes);

        }



        @Display.HdrCapabilities.HdrType

        int[] getSupportedHdrOutputTypes() {

            return DisplayControl.getSupportedHdrOutputTypes();

        }