P is now finalized to be 28

Change-Id: I0272f44485024c69c9f4c4e104933ccff6f4f21b

Author: tony-mak

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

@@ -93,9 +93,6 @@ public class DpcPreferenceHelper {
      *         not yet assigned.
      */
     private int getDeviceSdkInt() {
-        if (BuildCompat.isAtLeastP()) {
-            return Build.VERSION_CODES.CUR_DEVELOPMENT;
-        }
         return Build.VERSION.SDK_INT;
     }
 
@@ -220,10 +217,6 @@ public void disableIfConstraintsNotMet() {
      */
     private CharSequence findConstraintViolation() {
         if (getDeviceSdkInt() < mMinSdkVersion) {
-            // FIXME: Remove this special checking once P is out.
-            if (mMinSdkVersion > 27) {
-                return mContext.getString(R.string.requires_preview_release);
-            }
             return mContext.getString(R.string.requires_android_api_level, mMinSdkVersion);
         }
 

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

@@ -27,8 +27,7 @@
             <enum name="N" value="24" />
             <enum name="O" value="26" />
             <enum name="O_MR1" value="27" />
-            <enum name="P" value="10000" />
-            <!-- Build.VERSION_CODES.CUR_DEVELOPMENT, fill in the sdk int once it is finalized -->
+            <enum name="P" value="28" />
         </attr>
 
         <!-- Constrain a preference to DO or PO admins. -->