O is API 26
Bug: 37480230
Test: Build
Change-Id: Ia3615e3972ae1a02059841825cee3b1b45a959a9
(cherry picked from commit be462ea1d842efffa5f07f78da25706336960fec)
diff --git a/api/26.0.0-SNAPSHOT.txt b/api/26.0.0-SNAPSHOT.txt
index 4d049f2..b74a196 100644
--- a/api/26.0.0-SNAPSHOT.txt
+++ b/api/26.0.0-SNAPSHOT.txt
@@ -7750,7 +7750,7 @@
public class BuildCompat {
method public static deprecated boolean isAtLeastN();
method public static deprecated boolean isAtLeastNMR1();
- method public static boolean isAtLeastO();
+ method public static deprecated boolean isAtLeastO();
method public static boolean isAtLeastOMR1();
method public static boolean isAtLeastP();
}
diff --git a/compat/java/android/support/v4/os/BuildCompat.java b/compat/java/android/support/v4/os/BuildCompat.java
index 2bfd907..45d83df 100644
--- a/compat/java/android/support/v4/os/BuildCompat.java
+++ b/compat/java/android/support/v4/os/BuildCompat.java
@@ -60,11 +60,12 @@
* and all calls should be replaced with {@code Build.SDK_INT >= Build.VERSION_CODES#O}.
*
* @return {@code true} if O APIs are available for use, {@code false} otherwise
+ * @deprecated Android O is a finalized release and this method is no longer necessary. It will
+ * be removed in a future release of the Support Library. Instead use
+ * {@code Build.SDK_INT >= Build.VERSION_CODES#O}.
*/
public static boolean isAtLeastO() {
- return VERSION.CODENAME.equals("O")
- || VERSION.CODENAME.startsWith("ODR")
- || isAtLeastOMR1();
+ return VERSION.SDK_INT >= 26;
}
/**
