Fix build version check in TestDPC.

Bug: 117767560
Test: manual
Change-Id: If7b4b32ff90c78ed915f1f7bee588984377d771d

Author: yuemingw

app/src/main/java/com/afwsamples/testdpc/common/Util.java

@@ -27,6 +27,7 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -153,6 +154,12 @@ public static boolean isAtLeastM() {
         return Build.VERSION.SDK_INT >= VERSION_CODES.M;
     }
 
+    public static boolean isAtLeastQ() {
+        return VERSION.CODENAME.length() == 1
+            && VERSION.CODENAME.charAt(0) >= 'Q'
+            && VERSION.CODENAME.charAt(0) <= 'Z';
+    }
+
     @TargetApi(VERSION_CODES.O)
     public static List<UserHandle> getBindDeviceAdminTargetUsers(Context context) {
         if (!BuildCompat.isAtLeastO()) {

app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java

@@ -22,7 +22,6 @@
 import android.os.Build;
 import android.support.annotation.IntDef;
 import android.support.annotation.StringRes;
-import android.support.v4.os.BuildCompat;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.text.TextUtils;
@@ -93,6 +92,10 @@ public class DpcPreferenceHelper {
      *         not yet assigned.
      */
     private int getDeviceSdkInt() {
+        // TODO(b/117767701): Remove this when Q version code is finalized.
+        if (Util.isAtLeastQ()) {
+            return Build.VERSION_CODES.CUR_DEVELOPMENT;
+        }
         return Build.VERSION.SDK_INT;
     }
 

app/src/main/res/values/attrs.xml

@@ -28,6 +28,7 @@
             <enum name="O" value="26" />
             <enum name="O_MR1" value="27" />
             <enum name="P" value="28" />
+            <enum name="Q" value="10000" />
         </attr>
 
         <!-- Constrain a preference to DO or PO admins. -->