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 am: 168bddd4b3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23515562

Change-Id: Ic12a93a302e8e4a23caf6516511d207c6b64cd57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-02 14:23:36 +00:00
committed by Automerger Merge Worker
parent b67bcedd55 168bddd4b3
commit 719c89e0f7
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) {