Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix invalid cast in DisplaManager.getDisplays" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-06-02 14:07:11 +00:00
committed by Android (Google) Code Review
parent 28e76d58a5 0a99acc36b
commit 168bddd4b3
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/hardware/display/DisplayManager.java
View File

@@ -53,8 +53,6 @@ import android.view.Surface;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import libcore.util.EmptyArray;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@@ -667,7 +665,7 @@ public final class DisplayManager {
} else if (category == null || DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED.equals(category)) { } else if (category == null || DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED.equals(category)) {
return getDisplays(displayIds, Objects::nonNull); return getDisplays(displayIds, Objects::nonNull);
} }
return (Display[]) EmptyArray.OBJECT; return new Display[0];
} }
private Display[] getDisplays(int[] displayIds, Predicate<Display> predicate) { private Display[] getDisplays(int[] displayIds, Predicate<Display> predicate) {