Remove useless generics in method dealing with library enums

Bug: 22630667

Change-Id: I0a4d4c0e8c59ea159b6ea127f12b96512190d990

5 files changed, 10 insertions, 10 deletions

diff --git a/jack/src/com/android/jack/jayce/v0002/util/DispatchKindIdHelper.java b/jack/src/com/android/jack/jayce/v0002/util/DispatchKindIdHelper.java
index 6697227..977ce31 100644
--- a/jack/src/com/android/jack/jayce/v0002/util/DispatchKindIdHelper.java
+++ b/jack/src/com/android/jack/jayce/v0002/util/DispatchKindIdHelper.java
@@ -43,12 +43,12 @@ public class DispatchKindIdHelper {
   }
 
   @Nonnegative
-  public static byte getId(@Nonnull Enum<?> enumValue) {
+  public static byte getId(@Nonnull DispatchKind enumValue) {
     return ids[enumValue.ordinal()];
   }
 
   @Nonnull
-  public static Enum<?> getValue(@Nonnegative byte id) {
+  public static DispatchKind getValue(@Nonnegative byte id) {
     return values[id];
   }
 }
diff --git a/jack/src/com/android/jack/jayce/v0002/util/FieldRefKindIdHelper.java b/jack/src/com/android/jack/jayce/v0002/util/FieldRefKindIdHelper.java
index be7823b..862d21f 100644
--- a/jack/src/com/android/jack/jayce/v0002/util/FieldRefKindIdHelper.java
+++ b/jack/src/com/android/jack/jayce/v0002/util/FieldRefKindIdHelper.java
@@ -43,12 +43,12 @@ public class FieldRefKindIdHelper {
   }
 
   @Nonnegative
-  public static byte getId(@Nonnull Enum<?> enumValue) {
+  public static byte getId(@Nonnull FieldKind enumValue) {
     return ids[enumValue.ordinal()];
   }
 
   @Nonnull
-  public static Enum<?> getValue(@Nonnegative byte id) {
+  public static FieldKind getValue(@Nonnegative byte id) {
     return values[id];
   }
 
diff --git a/jack/src/com/android/jack/jayce/v0002/util/MethodKindIdHelper.java b/jack/src/com/android/jack/jayce/v0002/util/MethodKindIdHelper.java
index caf1ce5..7bbb391 100644
--- a/jack/src/com/android/jack/jayce/v0002/util/MethodKindIdHelper.java
+++ b/jack/src/com/android/jack/jayce/v0002/util/MethodKindIdHelper.java
@@ -45,12 +45,12 @@ public class MethodKindIdHelper {
   }
 
   @Nonnegative
-  public static byte getId(@Nonnull Enum<?> enumValue) {
+  public static byte getId(@Nonnull MethodKind enumValue) {
     return ids[enumValue.ordinal()];
   }
 
   @Nonnull
-  public static Enum<?> getValue(@Nonnegative byte id) {
+  public static MethodKind getValue(@Nonnegative byte id) {
     return values[id];
   }
 }
diff --git a/jack/src/com/android/jack/jayce/v0002/util/ReceiverKindIdHelper.java b/jack/src/com/android/jack/jayce/v0002/util/ReceiverKindIdHelper.java
index a0f6f10..b9d14ea 100644
--- a/jack/src/com/android/jack/jayce/v0002/util/ReceiverKindIdHelper.java
+++ b/jack/src/com/android/jack/jayce/v0002/util/ReceiverKindIdHelper.java
@@ -43,12 +43,12 @@ public class ReceiverKindIdHelper {
   }
 
   @Nonnegative
-  public static byte getId(@Nonnull Enum<?> enumValue) {
+  public static byte getId(@Nonnull ReceiverKind enumValue) {
     return ids[enumValue.ordinal()];
   }
 
   @Nonnull
-  public static Enum<?> getValue(@Nonnegative byte id) {
+  public static ReceiverKind getValue(@Nonnegative byte id) {
     return values[id];
   }
 }
diff --git a/jack/src/com/android/jack/jayce/v0002/util/RetentionPolicyIdHelper.java b/jack/src/com/android/jack/jayce/v0002/util/RetentionPolicyIdHelper.java
index 10b5752..fceacce 100644
--- a/jack/src/com/android/jack/jayce/v0002/util/RetentionPolicyIdHelper.java
+++ b/jack/src/com/android/jack/jayce/v0002/util/RetentionPolicyIdHelper.java
@@ -49,12 +49,12 @@ public class RetentionPolicyIdHelper {
   }
 
   @Nonnegative
-  public static byte getId(@Nonnull Enum<?> enumValue) {
+  public static byte getId(@Nonnull JRetentionPolicy enumValue) {
     return ids[enumValue.ordinal()];
   }
 
   @Nonnull
-  public static Enum<?> getValue(@Nonnegative byte id) {
+  public static JRetentionPolicy getValue(@Nonnegative byte id) {
     return values[id];
   }
 }