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

Merge "Return copies of private array members in Display.java to protect them from being modified from the outside." into udc-dev

Browse Source
This commit is contained in:
Marc Kassis
2023-04-20 08:42:25 +00:00
committed by Android (Google) Code Review
parent 5665fbf92f dc403705fd
commit 037b13c9af
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2188,7 +2188,7 @@ public final class Display {
*/
@NonNull
public float[] getAlternativeRefreshRates() {
return mAlternativeRefreshRates;
return Arrays.copyOf(mAlternativeRefreshRates, mAlternativeRefreshRates.length);
}
/**
@@ -2197,7 +2197,7 @@ public final class Display {
@NonNull
@HdrCapabilities.HdrType
public int[] getSupportedHdrTypes() {
return mSupportedHdrTypes;
return Arrays.copyOf(mSupportedHdrTypes, mSupportedHdrTypes.length);
}
/**
@@ -2497,8 +2497,10 @@ public final class Display {
* @deprecated use {@link Display#getMode()}
* and {@link Mode#getSupportedHdrTypes()} instead
*/
public @HdrType int[] getSupportedHdrTypes() {
return mSupportedHdrTypes;
@Deprecated
@HdrType
public int[] getSupportedHdrTypes() {
return Arrays.copyOf(mSupportedHdrTypes, mSupportedHdrTypes.length);
}
/**
* Returns the desired content max luminance data in cd/m2 for this display.

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

@@ -460,6 +460,36 @@ public class DisplayTest {
assertArrayEquals(sortedHdrTypes, displayMode.getSupportedHdrTypes());
}
@Test
public void testGetSupportedHdrTypesReturnsCopy() {
int[] hdrTypes = new int[]{1, 2, 3};
Display.Mode displayMode = new Display.Mode(0, 0, 0, 0, new float[0], hdrTypes);
int[] hdrTypesCopy = displayMode.getSupportedHdrTypes();
hdrTypesCopy[0] = 0;
assertArrayEquals(hdrTypes, displayMode.getSupportedHdrTypes());
}
@Test
public void testGetAlternativeRefreshRatesReturnsCopy() {
float[] alternativeRates = new float[]{1.0f, 2.0f};
Display.Mode displayMode = new Display.Mode(0, 0, 0, 0, alternativeRates, new int[0]);
float[] alternativeRatesCopy = displayMode.getAlternativeRefreshRates();
alternativeRatesCopy[0] = 0.0f;
assertArrayEquals(alternativeRates, displayMode.getAlternativeRefreshRates(), 0.0f);
}
@Test
public void testHdrCapabilitiesGetSupportedHdrTypesReturnsCopy() {
int[] hdrTypes = new int[]{1, 2, 3};
Display.HdrCapabilities hdrCapabilities = new Display.HdrCapabilities(hdrTypes, 0, 0, 0);
int[] hdrTypesCopy = hdrCapabilities.getSupportedHdrTypes();
hdrTypesCopy[0] = 0;
assertArrayEquals(hdrTypes, hdrCapabilities.getSupportedHdrTypes());
}
// Given rotated display dimensions, calculate the letterboxed app bounds.
private static Rect buildAppBounds(int displayWidth, int displayHeight) {
final int midWidth = displayWidth / 2;