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

Commit 26daee52 authored by Charles Chen's avatar Charles Chen
Browse files

Fix WindowExtensionsTest with API level override 

Test: atest WindowExtensionsTest with override
Bug: 343307330
Flag: EXEMPT bugfix
Change-Id: I37afff40d160af1f6d3de0a711f4fb9f951dc0ee
parent ad9cfa87

libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java

+6 −3
Original line number Diff line number Diff line
@@ -103,9 +103,12 @@ class WindowExtensionsImpl implements WindowExtensions { 
    @Override

    public int getVendorApiLevel() {

        final int levelOverride = getLevelOverride();

        return (levelOverride != NO_LEVEL_OVERRIDE)

                ? levelOverride

                : getExtensionsVersionCurrentPlatform();

        return hasLevelOverride() ? levelOverride : getExtensionsVersionCurrentPlatform();

    }



    @VisibleForTesting

    boolean hasLevelOverride() {

        return getLevelOverride() != NO_LEVEL_OVERRIDE;

    }



    private int getLevelOverride() {

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public class WindowExtensionsTest { 
    @Test

    public void testGetVendorApiLevel_extensionsEnabled_matchesCurrentVersion() {

        assumeTrue(WindowManager.hasWindowExtensionsEnabled());

        assumeFalse(((WindowExtensionsImpl) mExtensions).hasLevelOverride());

        assertThat(mVersion).isEqualTo(getExtensionsVersionCurrentPlatform());

    }