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

Commit 41088c75 authored by Ian Rogers's avatar Ian Rogers Committed by android-build-merger
Browse files

Merge "Extra generic type information to aid certain javacs." am: 8b9e56e0 

am: 0dbdcead

* commit '0dbdcead':
  Extra generic type information to aid certain javacs.
parents c2f6287b 0dbdcead

core/java/com/android/internal/util/Predicates.java

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public class Predicates { 
     * will be "short-circuited" as soon as the answer is determined.

     */

    public static <T> Predicate<T> and(Predicate<? super T>... components) {

        return and(Arrays.asList(components));

        return Predicates.<T>and(Arrays.asList(components));

    }



    /**
@@ -54,7 +54,7 @@ public class Predicates { 
     * will be "short-circuited" as soon as the answer is determined.

     */

    public static <T> Predicate<T> or(Predicate<? super T>... components) {

        return or(Arrays.asList(components));

        return Predicates.<T>or(Arrays.asList(components));

    }



    /**