1 files changed, 6 insertions, 38 deletions

diff --git a/common/src/com/android/tv/common/feature/Sdk.java b/common/src/com/android/tv/common/feature/Sdk.java
index 46a681f8..9f99a64f 100644
--- a/common/src/com/android/tv/common/feature/Sdk.java
+++ b/common/src/com/android/tv/common/feature/Sdk.java
@@ -18,50 +18,18 @@ package com.android.tv.common.feature;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.os.BuildCompat;
 
 /**
  *  Holder for SDK version features
  */
 public class Sdk {
-
-    public static final Feature N_PRE_2_OR_HIGHER =
-            new SdkPreviewVersionFeature(Build.VERSION_CODES.M, 2, true);
-
-    private static class SdkPreviewVersionFeature implements Feature {
-        private final int mVersionCode;
-        private final int mPreviewCode;
-        private final boolean mAllowHigherPreview;
-
-        private SdkPreviewVersionFeature(int versionCode, int previewCode,
-                boolean allowHigerPreview) {
-            mVersionCode = versionCode;
-            mPreviewCode = previewCode;
-            mAllowHigherPreview = allowHigerPreview;
-        }
-
-        @Override
-        public boolean isEnabled(Context context) {
-            try {
-                if (mAllowHigherPreview) {
-                    return Build.VERSION.SDK_INT == mVersionCode
-                            && Build.VERSION.PREVIEW_SDK_INT >= mPreviewCode;
-                } else {
-                    return Build.VERSION.SDK_INT == mVersionCode
-                            && Build.VERSION.PREVIEW_SDK_INT == mPreviewCode;
+    public static final Feature AT_LEAST_N =
+            new Feature() {
+                @Override
+                public boolean isEnabled(Context context) {
+                    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
                 }
-            } catch (NoSuchFieldError e) {
-                return false;
-            }
-        }
-    }
-
-    public static final Feature AT_LEAST_N = new Feature() {
-        @Override
-        public boolean isEnabled(Context context) {
-            return BuildCompat.isAtLeastN();
-        }
-    };
+            };
 
     private Sdk() {}
 }