Start using api version instead of codename.

Kenny Guy · Kenny Guy · commit a7febb84f57e · 2016-06-06T14:29:36.000+01:00
Update isBeforeN to check for SDK_INT

Bug: 29143947
Change-Id: Ieb7bb4486fb27b1c93e469553fb918142040aaf6
diff --git a/app/src/main/java/com/afwsamples/testdpc/common/Util.java b/app/src/main/java/com/afwsamples/testdpc/common/Util.java
@@ -104,8 +104,7 @@ public static boolean isBeforeM() {
     }
 
     public static boolean isBeforeN() {
-        // STOPSHIP Change to SDK_INT.
-        return isBeforeM() || !Build.VERSION.CODENAME.startsWith("N");
+        return Build.VERSION.SDK_INT < VERSION_CODES.N;
     }
 
     @TargetApi(VERSION_CODES.N)

Original file line number	Diff line number	Diff line change
`@@ -104,8 +104,7 @@ public static boolean isBeforeM() {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public static boolean isBeforeN() {`
`107`		`- // STOPSHIP Change to SDK_INT.`
`108`		`- return isBeforeM() \|\| !Build.VERSION.CODENAME.startsWith("N");`
	`107`	`+ return Build.VERSION.SDK_INT < VERSION_CODES.N;`
`109`	`108`	`}`
`110`	`109`
`111`	`110`	`@TargetApi(VERSION_CODES.N)`