| commit | 26daee529852d773398f9614453e936c954a20e5 | [log] [tgz] |
|---|---|---|
| author | Charles Chen <charlesccchen@google.com> | Thu Jul 18 09:50:05 2024 +0800 |
| committer | Charles Chen <charlesccchen@google.com> | Mon Jul 22 12:10:19 2024 +0800 |
| tree | 7a6261283052d7fa930520e2645e0f972fd5e68b | |
| parent | ad9cfa8705c6b9ce0525e2aeaf3464ec0824d47b [diff] |
Fix WindowExtensionsTest with API level override Test: atest WindowExtensionsTest with override Bug: 343307330 Flag: EXEMPT bugfix Change-Id: I37afff40d160af1f6d3de0a711f4fb9f951dc0ee
diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java index f8cfb20..7f11fea 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/WindowExtensionsImpl.java
@@ -103,9 +103,12 @@ @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() {
diff --git a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java index 1a7090d..92f4814 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java +++ b/libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java
@@ -59,6 +59,7 @@ @Test public void testGetVendorApiLevel_extensionsEnabled_matchesCurrentVersion() { assumeTrue(WindowManager.hasWindowExtensionsEnabled()); + assumeFalse(((WindowExtensionsImpl) mExtensions).hasLevelOverride()); assertThat(mVersion).isEqualTo(getExtensionsVersionCurrentPlatform()); }