Merge "N is API 24" into nyc-dev
am: 4957b79ef6
* commit '4957b79ef6a75e56faa6a53ec66ebcb33b38f54b':
N is API 24
Change-Id: I5d89f4b3adb5392641e7023e097f389b0a728ca7
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;
}
}