diff options
| -rw-r--r-- | legacy-test/src/com/android/internal/util/Predicate.java | 1 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/legacy-test/src/com/android/internal/util/Predicate.java b/legacy-test/src/com/android/internal/util/Predicate.java index 1b5eaff67b87..e87f489f4670 100644 --- a/legacy-test/src/com/android/internal/util/Predicate.java +++ b/legacy-test/src/com/android/internal/util/Predicate.java @@ -27,6 +27,7 @@ package com.android.internal.util; * strongly encouraged to state this fact clearly in their API documentation. * * @deprecated Use {@code java.util.function.Predicate} instead. + * This must not be used outside frameworks/base/test-runner. */ @Deprecated public interface Predicate<T> { diff --git a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java index 99f2685c6ce7..96fbc1402296 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java +++ b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java @@ -32,7 +32,6 @@ import android.support.test.filters.MediumTest; import android.support.test.runner.AndroidJUnit4; import android.util.ArraySet; -import com.android.internal.util.Predicate; import com.android.server.wm.TaskSnapshotPersister.RemoveObsoleteFilesQueueItem; import org.junit.Test; @@ -200,4 +199,16 @@ public class TaskSnapshotPersisterLoaderTest extends TaskSnapshotPersisterTestBa new File(sFilesDir.getPath() + "/snapshots/2_reduced.jpg")}; assertTrueForFiles(existsFiles, File::exists, " must exist"); } + + /** + * Private predicate definition. + * + * This is needed because com.android.internal.util.Predicate is deprecated + * and can only be used with classes fron android.test.runner. This cannot + * use java.util.function.Predicate because that is not present on all API + * versions that this test must run on. + */ + private interface Predicate<T> { + boolean apply(T t); + } } |