Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ea715b5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Fix invalid cast in DisplaManager.getDisplays" into udc-dev am: 168bddd4 am: 719c89e0 am: 3a339962

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



Change-Id: I79ca5104d7566e96a0358ba0aa02bafe0831ab7d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e703028 3a339962

core/java/android/hardware/display/DisplayManager.java

+1 −3
Original line number Diff line number Diff line
@@ -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) {