1 files changed, 1 insertions, 14 deletions
diff --git a/tuner/src/com/android/tv/tuner/api/Tuner.java b/tuner/src/com/android/tv/tuner/api/Tuner.java
index 02df3ca1..6f7e9d94 100644
--- a/tuner/src/com/android/tv/tuner/api/Tuner.java
+++ b/tuner/src/com/android/tv/tuner/api/Tuner.java
@@ -28,8 +28,6 @@ public interface Tuner extends AutoCloseable {
     int FILTER_TYPE_VIDEO = 2;
     int FILTER_TYPE_PCR = 3;
     String MODULATION_8VSB = "8VSB";
-    String MODULATION_QAM16 = "QAM16";
-    String MODULATION_QAM64 = "QAM64";
     String MODULATION_QAM256 = "QAM256";
     int DELIVERY_SYSTEM_UNDEFINED = 0;
     int DELIVERY_SYSTEM_ATSC = 1;
@@ -42,7 +40,6 @@ public interface Tuner extends AutoCloseable {
     int TUNER_TYPE_USB = 2;
     int TUNER_TYPE_NETWORK = 3;
     int BUILT_IN_TUNER_TYPE_LINUX_DVB = 1;
-    int BUILT_IN_TUNER_TYPE_ARCHER = 100;
 
     /** Check a delivery system is for DVB or not. */
     static boolean isDvbDeliverySystem(@DeliverySystemType int deliverySystemType) {
@@ -69,11 +66,6 @@ public interface Tuner extends AutoCloseable {
 
     boolean tune(int frequency, @ModulationType String modulation, String channelNumber);
 
-    default boolean tune(@DeliverySystemType int deliverySystemType, int frequency,
-                 @ModulationType String modulation, String channelNumber) {
-      return tune(frequency, modulation, channelNumber);
-    }
-
     boolean addPidFilter(int pid, @FilterType int filterType);
 
     void stopTune();
@@ -81,10 +73,6 @@ public interface Tuner extends AutoCloseable {
     void setHasPendingTune(boolean hasPendingTune);
 
     int getDeliverySystemType();
-    default int[] getDeliverySystemTypes() {
-      int[] deliverySystemTypes = {DELIVERY_SYSTEM_UNDEFINED};
-      return deliverySystemTypes;
-    };
 
     int readTsStream(byte[] javaBuffer, int javaBufferSize);
 
@@ -96,7 +84,7 @@ public interface Tuner extends AutoCloseable {
     public @interface FilterType {}
 
     /** Modulation Type */
-    @StringDef({MODULATION_8VSB, MODULATION_QAM256, MODULATION_QAM16, MODULATION_QAM64})
+    @StringDef({MODULATION_8VSB, MODULATION_QAM256})
     @Retention(RetentionPolicy.SOURCE)
     public @interface ModulationType {}
 
@@ -120,7 +108,6 @@ public interface Tuner extends AutoCloseable {
 
     /** Built in tuner type */
     @IntDef({
-        BUILT_IN_TUNER_TYPE_ARCHER,
         BUILT_IN_TUNER_TYPE_LINUX_DVB
     })
     @Retention(RetentionPolicy.SOURCE)