commit 9347ae615174564cf1eb2ab461a0efd5af462444
author Adam Powell <adamp@google.com> Thu May 26 02:00:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 26 02:00:15 2016 +0000
tree e810f9b38625f9c5bb15683e1170b29e18ee532f
parent bd335e5e953725ff59d66c8226e2a8b164b29824
parent 3b875f3f533e1db220a030afc437fcbc5f82dafe

Merge "N is API 24" into nyc-dev am: 4957b79ef6
am: 3b875f3f53

* commit '3b875f3f533e1db220a030afc437fcbc5f82dafe':
  N is API 24

Change-Id: I7c1fe5fc9abb1576c9c48dcee3c2cc94ad117b00

v4/donut/android/support/v4/os/BuildCompat.java

diff --git a/v4/donut/android/support/v4/os/BuildCompat.java b/v4/donut/android/support/v4/os/BuildCompat.java
index 9792598..4b2ba3d 100644
--- a/v4/donut/android/support/v4/os/BuildCompat.java
+++ b/v4/donut/android/support/v4/os/BuildCompat.java
@@ -30,16 +30,10 @@
 
     /**
      * Check if the device is running on the Android N release or newer.
-     * This method is suitable for use with preview SDKs and associated
-     * pre-release device builds.
      *
      * @return {@code true} if N APIs are available for use
      */
     public static boolean isAtLeastN() {
-        if (TextUtils.isEmpty(VERSION.CODENAME) || "REL".equals(VERSION.CODENAME)) {
-            return VERSION.SDK_INT > 23;
-        }
-        final char prefix = VERSION.CODENAME.charAt(0);
-        return prefix >= 'N' && prefix <= 'Z';
+        return VERSION.SDK_INT >= 24;
     }
 }