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
This commit is contained in:
Jan Sebechlebsky
2023-06-02 12:14:01 +02:00
parent 05bdb35bb6
commit 0a99acc36b

View File

@@ -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<Display> predicate) {