DpcPreference support for O-MR1 features

AndrewScull · AndrewScull · commit bd02ff43ff3d · 2017-09-07T16:49:00.000+01:00
Change-Id: I0add2cbab3857a12542ae3272bbe2036c75ba742
(cherry picked from commit 9194ef0ba925f68340f97f7ae0dea5babe96d31f)
diff --git a/app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java b/app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java
@@ -93,8 +93,8 @@ public class DpcPreferenceHelper {
      *         not yet assigned.
      */
     private int getDeviceSdkInt() {
-        if (BuildCompat.isAtLeastO()) {
-            return Build.VERSION_CODES.O;
+        if (BuildCompat.isAtLeastOMR1()) {
+            return Build.VERSION_CODES.CUR_DEVELOPMENT;
         }
         return Build.VERSION.SDK_INT;
     }
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -26,6 +26,7 @@
             <enum name="M" value="23" />
             <enum name="N" value="24" />
             <enum name="O" value="26" />
+            <enum name="O_MR1" value="10000" />
             <!-- Build.VERSION_CODES.CUR_DEVELOPMENT, fill in the sdk int once it is finalized -->
         </attr>
 

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,8 @@ public class DpcPreferenceHelper {`
`93`	`93`	`* not yet assigned.`
`94`	`94`	`*/`
`95`	`95`	`private int getDeviceSdkInt() {`
`96`		`- if (BuildCompat.isAtLeastO()) {`
`97`		`- return Build.VERSION_CODES.O;`
	`96`	`+ if (BuildCompat.isAtLeastOMR1()) {`
	`97`	`+ return Build.VERSION_CODES.CUR_DEVELOPMENT;`
`98`	`98`	`}`
`99`	`99`	`return Build.VERSION.SDK_INT;`
`100`	`100`	`}`