Update truth usage to compile with truth-1.0.1 APIs.
Bug: 168765701
Test: m checkbuild
Merged-In: I749eaafe419d63f90360d6508e01c473ba194210
Change-Id: I749eaafe419d63f90360d6508e01c473ba194210
(cherry picked from commit 99696e379072e49f5d5e5d3ec61c50413129a7c3)
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/display/DisplayModesTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/display/DisplayModesTestActivity.java
index 7c8a208..2b06bde 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/display/DisplayModesTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/display/DisplayModesTestActivity.java
@@ -303,7 +303,7 @@
}
}
- private static class ModeSubject extends Subject<ModeSubject, Display.Mode> {
+ private static class ModeSubject extends Subject {
private final Display.Mode mActual;
public ModeSubject(FailureMetadata failureMetadata, @Nullable Display.Mode subject) {
diff --git a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/PackageInstallerSessionInfoSubject.java b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/PackageInstallerSessionInfoSubject.java
index 4186ba1..fa0504d 100644
--- a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/PackageInstallerSessionInfoSubject.java
+++ b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/PackageInstallerSessionInfoSubject.java
@@ -24,8 +24,7 @@
import javax.annotation.Nullable;
-final class PackageInstallerSessionInfoSubject extends
- Subject<PackageInstallerSessionInfoSubject, PackageInstaller.SessionInfo> {
+final class PackageInstallerSessionInfoSubject extends Subject {
private final PackageInstaller.SessionInfo mActual;
private PackageInstallerSessionInfoSubject(FailureMetadata failureMetadata,
diff --git a/libs/rollback/src/com/android/cts/rollback/lib/RollbackInfoSubject.java b/libs/rollback/src/com/android/cts/rollback/lib/RollbackInfoSubject.java
index 9f912e0..1903cc4 100644
--- a/libs/rollback/src/com/android/cts/rollback/lib/RollbackInfoSubject.java
+++ b/libs/rollback/src/com/android/cts/rollback/lib/RollbackInfoSubject.java
@@ -32,7 +32,7 @@
/**
* Subject for asserting things about RollbackInfo instances.
*/
-public final class RollbackInfoSubject extends Subject<RollbackInfoSubject, RollbackInfo> {
+public final class RollbackInfoSubject extends Subject {
private final RollbackInfo mActual;
/**
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvTrackInfoSubject.java b/tests/tests/tv/src/android/media/tv/cts/TvTrackInfoSubject.java
index cb1bae9..5525963 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvTrackInfoSubject.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvTrackInfoSubject.java
@@ -33,7 +33,7 @@
import com.google.common.truth.Subject;
/** Test {@link Subject} for {@link TvTrackInfo}. */
-public final class TvTrackInfoSubject extends Subject<TvTrackInfoSubject, TvTrackInfo> {
+public final class TvTrackInfoSubject extends Subject {
// TODO(b/153190774): Move to androidx.test.ext.truth
@Nullable