From 57e490cf8cf85932c11208c64bbd2b35315ffbc8 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Thu, 9 Feb 2017 14:47:53 +0000
Subject: [PATCH] Partial Revert "Replace com.android.internal.util.Predicate
 with java.util.function.Predicate"

This partially reverts commit 3e5fbca0c57742f28f5c7e6bda6c3500b9471b47.

Bug: 35187548
Bug: 30188076
Bug: 35089332
Test: make checkbuild
Change-Id: I7ab4279aab604e3d56003b0a59867948aebabd28
---
 .../src => core/java}/com/android/internal/util/Predicate.java   | 0
 .../src => core/java}/com/android/internal/util/Predicates.java  | 1 -
 .../utiltests}/src/com/android/internal/util/PredicatesTest.java | 0
 3 files changed, 1 deletion(-)
 rename {test-runner/src => core/java}/com/android/internal/util/Predicate.java (100%)
 rename {test-runner/src => core/java}/com/android/internal/util/Predicates.java (99%)
 rename {test-runner/tests => core/tests/utiltests}/src/com/android/internal/util/PredicatesTest.java (100%)

diff --git a/test-runner/src/com/android/internal/util/Predicate.java b/core/java/com/android/internal/util/Predicate.java
similarity index 100%
rename from test-runner/src/com/android/internal/util/Predicate.java
rename to 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
similarity index 99%
rename from test-runner/src/com/android/internal/util/Predicates.java
rename to core/java/com/android/internal/util/Predicates.java
index 30b8dc6b6ee21..c006564f129a4 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
similarity index 100%
rename from test-runner/tests/src/com/android/internal/util/PredicatesTest.java
rename to core/tests/utiltests/src/com/android/internal/util/PredicatesTest.java