diff options
| author | 2017-02-09 19:18:34 +0000 | |
|---|---|---|
| committer | 2017-02-09 19:18:35 +0000 | |
| commit | 621ebe692fdaf0cc018e0f152bd9214577f01020 (patch) | |
| tree | 2e28a8854d459d9863a39cbb592cf381399abc49 | |
| parent | 60f11f3d16acbbfa5f54a67e1606e5dad5d9eb5e (diff) | |
| parent | 57e490cf8cf85932c11208c64bbd2b35315ffbc8 (diff) | |
Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate""
| -rw-r--r-- | core/java/com/android/internal/util/Predicate.java (renamed from test-runner/src/com/android/internal/util/Predicate.java) | 0 | ||||
| -rw-r--r-- | core/java/com/android/internal/util/Predicates.java (renamed from test-runner/src/com/android/internal/util/Predicates.java) | 1 | ||||
| -rw-r--r-- | core/tests/utiltests/src/com/android/internal/util/PredicatesTest.java (renamed from test-runner/tests/src/com/android/internal/util/PredicatesTest.java) | 0 |
3 files changed, 0 insertions, 1 deletions
diff --git a/test-runner/src/com/android/internal/util/Predicate.java b/core/java/com/android/internal/util/Predicate.java index bc6d6b31dd28..bc6d6b31dd28 100644 --- a/test-runner/src/com/android/internal/util/Predicate.java +++ b/core/java/com/android/internal/util/Predicate.java diff --git a/test-runner/src/com/android/internal/util/Predicates.java b/core/java/com/android/internal/util/Predicates.java index 30b8dc6b6ee2..c006564f129a 100644 --- a/test-runner/src/com/android/internal/util/Predicates.java +++ b/core/java/com/android/internal/util/Predicates.java @@ -21,7 +21,6 @@ import java.util.Arrays; /** * Predicates contains static methods for creating the standard set of * {@code Predicate} objects. - * @hide */ public class Predicates { diff --git a/test-runner/tests/src/com/android/internal/util/PredicatesTest.java b/core/tests/utiltests/src/com/android/internal/util/PredicatesTest.java index c46ff051dd33..c46ff051dd33 100644 --- a/test-runner/tests/src/com/android/internal/util/PredicatesTest.java +++ b/core/tests/utiltests/src/com/android/internal/util/PredicatesTest.java |