Merge "Fix errorprone warnings that should be errors" am: 3818a819a3main-16k-with-phones

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/2255382

Change-Id: I6d79560a5d35c94d547c3924005267fbc4aa57d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 8 insertions, 11 deletions

diff --git a/dexgen/src/com/android/dexgen/dex/file/StringIdItem.java b/dexgen/src/com/android/dexgen/dex/file/StringIdItem.java
index 30f31d421..f7d1408fc 100644
--- a/dexgen/src/com/android/dexgen/dex/file/StringIdItem.java
+++ b/dexgen/src/com/android/dexgen/dex/file/StringIdItem.java
@@ -24,7 +24,7 @@ import com.android.dexgen.util.Hex;
  * Representation of a string inside a Dalvik file.
  */
 public final class StringIdItem
-        extends IndexedItem implements Comparable {
+        extends IndexedItem implements Comparable<StringIdItem> {
     /** size of instances when written out to a file, in bytes */
     public static final int WRITE_SIZE = 4;
 
@@ -66,9 +66,8 @@ public final class StringIdItem
     }
 
     /** {@inheritDoc} */
-    public int compareTo(Object other) {
-        StringIdItem otherString = (StringIdItem) other;
-        return value.compareTo(otherString.value);
+    public int compareTo(StringIdItem other) {
+        return value.compareTo(other.value);
     }
 
     /** {@inheritDoc} */
diff --git a/dx/src/com/android/dx/dex/file/CallSiteIdItem.java b/dx/src/com/android/dx/dex/file/CallSiteIdItem.java
index cf0bb24ef..ffe445e2a 100644
--- a/dx/src/com/android/dx/dex/file/CallSiteIdItem.java
+++ b/dx/src/com/android/dx/dex/file/CallSiteIdItem.java
@@ -23,7 +23,7 @@ import com.android.dx.util.Hex;
 /**
  * Representation of a call site reference in a DEX file.
  */
-public final class CallSiteIdItem extends IndexedItem implements Comparable {
+public final class CallSiteIdItem extends IndexedItem implements Comparable<CallSiteIdItem> {
 
     /** The item size when placed in a DEX file. */
     private static final int ITEM_SIZE = 4;
@@ -83,8 +83,7 @@ public final class CallSiteIdItem extends IndexedItem implements Comparable {
 
     /** {@inheritDoc} */
     @Override
-    public int compareTo(Object o) {
-        CallSiteIdItem other = (CallSiteIdItem) o;
+    public int compareTo(CallSiteIdItem other) {
         return invokeDynamicRef.compareTo(other.invokeDynamicRef);
     }
 }
diff --git a/dx/src/com/android/dx/dex/file/StringIdItem.java b/dx/src/com/android/dx/dex/file/StringIdItem.java
index e4fb559b8..29d399a37 100644
--- a/dx/src/com/android/dx/dex/file/StringIdItem.java
+++ b/dx/src/com/android/dx/dex/file/StringIdItem.java
@@ -25,7 +25,7 @@ import com.android.dx.util.Hex;
  * Representation of a string inside a Dalvik file.
  */
 public final class StringIdItem
-        extends IndexedItem implements Comparable {
+        extends IndexedItem implements Comparable<StringIdItem> {
     /** {@code non-null;} the string value */
     private final CstString value;
 
@@ -65,9 +65,8 @@ public final class StringIdItem
 
     /** {@inheritDoc} */
     @Override
-    public int compareTo(Object other) {
-        StringIdItem otherString = (StringIdItem) other;
-        return value.compareTo(otherString.value);
+    public int compareTo(StringIdItem other) {
+        return value.compareTo(other.value);
     }
 
     /** {@inheritDoc} */