From 0a99acc36b939c02ce20141a2308511eb1f4ea1b Mon Sep 17 00:00:00 2001 From: Jan Sebechlebsky Date: Fri, 2 Jun 2023 12:14:01 +0200 Subject: [PATCH] Fix invalid cast in DisplaManager.getDisplays ... when invalid/unknown display category is requested. Bug: 283991620 Bug: 273242347 Test: atest android.display.cts.DisplayTest#getDisplaysWithInvalidCategory_returnsEmptyArray Change-Id: I44fa039882dac8eef9d0fb9b82109251e5cdb1df --- core/java/android/hardware/display/DisplayManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index b4533042b4a35..76efce56dcf0c 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -53,8 +53,6 @@ import android.view.Surface; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; -import libcore.util.EmptyArray; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.ref.WeakReference; @@ -667,7 +665,7 @@ public final class DisplayManager { } else if (category == null || DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED.equals(category)) { return getDisplays(displayIds, Objects::nonNull); } - return (Display[]) EmptyArray.OBJECT; + return new Display[0]; } private Display[] getDisplays(int[] displayIds, Predicate predicate) {