Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove use of deprecated API for Display.getReportedHdrTypes" into udc-dev am: 81dc268efc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21539125

Change-Id: Ic29d961216ea6afd1fbda87fb45c0df3b9fc141d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Marc Kassis
2023-02-24 17:17:38 +00:00
committed by Automerger Merge Worker
parent 4278d769a7 81dc268efc
commit 976d348d6e
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/Display.java
View File

@@ -1261,20 +1261,17 @@ public final class Display {
/**
* @hide
* Returns the display's HDR supported types.
* Returns the current mode's supported HDR types.
*
* @see #isHdr()
* @see HdrCapabilities#getSupportedHdrTypes()
* @see Mode#getSupportedHdrTypes()
*/
@TestApi
@NonNull
public int[] getReportedHdrTypes() {
synchronized (mLock) {
updateDisplayInfoLocked();
if (mDisplayInfo.hdrCapabilities == null) {
return new int[0];
}
return mDisplayInfo.hdrCapabilities.getSupportedHdrTypes();
return mDisplayInfo.getMode().getSupportedHdrTypes();
}
}

25
core/tests/mockingcoretests/src/android/view/DisplayTest.java
View File

@@ -116,6 +116,31 @@ public class DisplayTest {
Mockito.framework().clearInlineMocks();
}
@Test
public void testGetReportedHdrTypes_returns_mode_specific_hdr_types() {
setDisplayInfoPortrait(mDisplayInfo);
float[] alternativeRefreshRates = new float[0];
int[] hdrTypesWithDv = new int[] {1, 2, 3, 4};
Display.Mode modeWithDv = new Display.Mode(/* modeId= */ 0, 0, 0, 0f,
alternativeRefreshRates, hdrTypesWithDv);
int[] hdrTypesWithoutDv = new int[]{2, 3, 4};
Display.Mode modeWithoutDv = new Display.Mode(/* modeId= */ 1, 0, 0, 0f,
alternativeRefreshRates, hdrTypesWithoutDv);
mDisplayInfo.supportedModes = new Display.Mode[] {modeWithoutDv, modeWithDv};
mDisplayInfo.hdrCapabilities = new Display.HdrCapabilities(hdrTypesWithDv, 0, 0, 0);
final Display display = new Display(mDisplayManagerGlobal, DEFAULT_DISPLAY, mDisplayInfo,
DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS);
mDisplayInfo.modeId = 0;
assertArrayEquals(hdrTypesWithDv, display.getReportedHdrTypes());
mDisplayInfo.modeId = 1;
assertArrayEquals(hdrTypesWithoutDv, display.getReportedHdrTypes());
}
@Test
public void testConstructor_defaultDisplayAdjustments_matchesDisplayInfo() {
setDisplayInfoPortrait(mDisplayInfo);