aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2016-05-26 01:03:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-26 01:03:09 +0000
commit4957b79ef6a75e56faa6a53ec66ebcb33b38f54b (patch)
tree48e326ce1fd914ffc34b3a958080f392aa3619c4
parent0ed6d7a09c91d6836a9fcfe6d5c136416a60476b (diff)
parentbaf870c0330078535898e98263795e6a46694b31 (diff)
downloadsupport-4957b79ef6a75e56faa6a53ec66ebcb33b38f54b.tar.gz
Merge "N is API 24" into nyc-dev
-rw-r--r--v4/donut/android/support/v4/os/BuildCompat.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/v4/donut/android/support/v4/os/BuildCompat.java b/v4/donut/android/support/v4/os/BuildCompat.java
index 9792598bad1..4b2ba3d5969 100644
--- a/v4/donut/android/support/v4/os/BuildCompat.java
+++ b/v4/donut/android/support/v4/os/BuildCompat.java
@@ -30,16 +30,10 @@ public class BuildCompat {
/**
* 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;
}
}