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