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

Commit 2f0f93ea authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Support display cutout side override in tests 

The mocked resource will accidentally return null without return value
override and will break the NonNull contract of the obtainTypedArray
API. Return the mock array instead to avoid the unexpected crash.

Test: LocalDisplayAdapterTest
Bug: 302387383
Change-Id: I9b5542da0d3820a1f7e7c421518771ac580cfbe3
parent 8ce9cb3d

services/tests/displayservicetests/src/com/android/server/display/LocalDisplayAdapterTest.java

+4 −0
Original line number Diff line number Diff line
@@ -176,6 +176,10 @@ public class LocalDisplayAdapterTest { 
        when(mockArray.length()).thenReturn(0);

        when(mMockedResources.obtainTypedArray(R.array.config_maskBuiltInDisplayCutoutArray))

                .thenReturn(mockArray);

        when(mMockedResources.obtainTypedArray(R.array.config_displayCutoutSideOverrideArray))

                .thenReturn(mockArray);

        when(mMockedResources.getStringArray(R.array.config_mainBuiltInDisplayCutoutSideOverride))

                .thenReturn(new String[]{});

        when(mMockedResources.obtainTypedArray(R.array.config_waterfallCutoutArray))

                .thenReturn(mockArray);

        when(mMockedResources.obtainTypedArray(R.array.config_roundedCornerRadiusArray))