Replace VERSION.SDK_INT with Util.SDK_INT.

This is to ensure that the new release of TestDPC still works with the
pre-release version of Q.

When we begin adding R features to TestDPC, we can replace IS_RUNNING_Q
with IS_RUNNING_R. This will make it easier to transition upon full
release of R in future.

Test: Manual
Change-Id: Ib0c930335f1b9a35544c97ce2e1b970592cd7d6a

Author: jscott1989

app/src/main/java/com/afwsamples/testdpc/AddAccountActivity.java

@@ -28,7 +28,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.UserManager;
@@ -38,6 +37,7 @@
 import android.widget.EditText;
 import android.widget.RadioGroup;
 import android.widget.Toast;
+import com.afwsamples.testdpc.common.Util;
 import com.android.setupwizardlib.GlifLayout;
 import java.io.IOException;
 
@@ -123,7 +123,7 @@ private void addAccount(String accountName) {
     }
 
     private void disableUserRestrictions() {
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
+        if (Util.SDK_INT >= VERSION_CODES.N) {
             // DPC is allowed to bypass DISALLOW_MODIFY_ACCOUNTS on N or above.
             Log.v(TAG, "skip disabling user restriction on N or above");
             return;
@@ -136,7 +136,7 @@ private void disableUserRestrictions() {
     }
 
     private void restoreUserRestrictions() {
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
+        if (Util.SDK_INT >= VERSION_CODES.N) {
             // DPC is allowed to bypass DISALLOW_MODIFY_ACCOUNTS on N or above.
             Log.v(TAG, "skip restoring user restrictions on N or above");
             return;

app/src/main/java/com/afwsamples/testdpc/BootReceiver.java

@@ -21,7 +21,6 @@
 import android.content.Intent;
 import android.os.Process;
 import android.os.UserHandle;
-
 import com.afwsamples.testdpc.common.Util;
 import com.afwsamples.testdpc.comp.BindDeviceAdminServiceHelper;
 import com.afwsamples.testdpc.comp.DeviceOwnerService;

app/src/main/java/com/afwsamples/testdpc/CommonReceiverOperations.java

@@ -31,6 +31,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
+import com.afwsamples.testdpc.common.Util;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -92,7 +93,7 @@ public static void onNetworkLogsAvailable(Context context, ComponentName admin,
                 context.getString(R.string.on_network_logs_available_success, batchToken));
 
         ArrayList<String> loggedEvents = new ArrayList<>();
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.P) {
+        if (Util.SDK_INT >= VERSION_CODES.P) {
             for (NetworkEvent event : events) {
                 loggedEvents.add(event.toString());
             }

app/src/main/java/com/afwsamples/testdpc/DeviceAdminReceiver.java

@@ -26,7 +26,6 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Binder;
-import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.ParcelFileDescriptor;
 import android.os.PersistableBundle;
@@ -38,7 +37,6 @@
 import android.widget.Toast;
 import com.afwsamples.testdpc.common.NotificationUtil;
 import com.afwsamples.testdpc.common.Util;
-import com.afwsamples.testdpc.policy.UserRestriction;
 import com.afwsamples.testdpc.provision.PostProvisioningTask;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -506,7 +504,7 @@ && isUsingUnifiedPassword(context)) {
 
     @TargetApi(VERSION_CODES.P)
     private static Boolean isUsingUnifiedPassword(Context context) {
-        if (Build.VERSION.SDK_INT < VERSION_CODES.P) {
+        if (Util.SDK_INT < VERSION_CODES.P) {
             return false;
         }
         final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);

app/src/main/java/com/afwsamples/testdpc/DeviceAdminService.java

@@ -3,7 +3,6 @@
 import android.content.BroadcastReceiver;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.support.annotation.RequiresApi;
 

app/src/main/java/com/afwsamples/testdpc/FinalizeActivity.java

@@ -17,7 +17,6 @@
 package com.afwsamples.testdpc;
 
 import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -30,7 +29,6 @@
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import com.afwsamples.testdpc.common.LaunchIntentUtil;
 import com.afwsamples.testdpc.common.Util;
 import com.afwsamples.testdpc.provision.ProvisioningUtil;

app/src/main/java/com/afwsamples/testdpc/PackageMonitorReceiver.java

@@ -7,7 +7,6 @@
 import android.content.Intent;
 import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
-
 import com.afwsamples.testdpc.common.NotificationUtil;
 
 public class PackageMonitorReceiver extends BroadcastReceiver {

app/src/main/java/com/afwsamples/testdpc/SetupManagementFragment.java

@@ -37,7 +37,6 @@
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.PersistableBundle;
@@ -161,7 +160,7 @@ public void onResume() {
 
         if (setProvisioningMethodsVisibility()) {
             // The extra logo uri and color are supported only from N
-            if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
+            if (Util.SDK_INT >= VERSION_CODES.N) {
                 getView().findViewById(R.id.params_title).setVisibility(View.VISIBLE);
                 if (canAnAppHandleGetContent()) {
                     getView().findViewById(
@@ -190,18 +189,18 @@ private void setProvisioningModeSpecificUI() {
         final boolean isManagedProfileAction = setUpOptionId == R.id.setup_managed_profile;
         final boolean isManagedDeviceAction = setUpOptionId == R.id.setup_device_owner;
         mSkipUserConsent.setVisibility(
-            Build.VERSION.SDK_INT >= VERSION_CODES.O
+            Util.SDK_INT >= VERSION_CODES.O
                 && isManagedProfileAction
                 && Util.isDeviceOwner(getActivity())
                 ? View.VISIBLE
                 : View.GONE);
         mKeepAccountMigrated.setVisibility(
-            Build.VERSION.SDK_INT >= VERSION_CODES.O && isManagedProfileAction
+            Util.SDK_INT >= VERSION_CODES.O && isManagedProfileAction
                 ? View.VISIBLE
                 : View.GONE);
         mSkipEncryption.setVisibility(
-            (isManagedProfileAction && Build.VERSION.SDK_INT >= VERSION_CODES.N)
-                || (isManagedDeviceAction && Build.VERSION.SDK_INT >= VERSION_CODES.M)
+            (isManagedProfileAction && Util.SDK_INT >= VERSION_CODES.N)
+                || (isManagedDeviceAction && Util.SDK_INT >= VERSION_CODES.M)
                 ? View.VISIBLE
                 : View.GONE);
 
@@ -216,7 +215,7 @@ private void maybeLaunchProvisioning(String intentAction, int requestCode) {
         Activity activity = getActivity();
 
         Intent intent = new Intent(intentAction);
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.M) {
+        if (Util.SDK_INT >= VERSION_CODES.M) {
             intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
                     DeviceAdminReceiver.getComponentName(getActivity()));
         } else {
@@ -259,7 +258,7 @@ private void maybeSpecifySyncAuthExtras(Intent intent, PersistableBundle adminEx
         Account accountToMigrate = LaunchIntentUtil.getAddedAccount(launchIntent);
         if (accountToMigrate != null) {
             // EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE only supported in API 22+.
-            if (Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP_MR1) {
+            if (Util.SDK_INT >= VERSION_CODES.LOLLIPOP_MR1) {
                 // Configure the account to migrate into the managed profile if setup
                 // completes.
                 intent.putExtra(EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE, accountToMigrate);
@@ -276,7 +275,7 @@ private void maybeSpecifySyncAuthExtras(Intent intent, PersistableBundle adminEx
     private void maybePassAffiliationIds(Intent intent, PersistableBundle adminExtras) {
         if (Util.isDeviceOwner(getActivity())
                 && ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
-                && Build.VERSION.SDK_INT >= VERSION_CODES.O) {
+                && Util.SDK_INT >= VERSION_CODES.O) {
             passAffiliationIds(intent, adminExtras);
         }
     }
@@ -302,15 +301,15 @@ private void passAffiliationIds(Intent intent, PersistableBundle adminExtras) {
      * @return true if we can launch the intent
      */
     private boolean maybeSpecifyNExtras(Intent intent) {
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.N) {
+        if (Util.SDK_INT >= VERSION_CODES.N) {
             specifyLogoUri(intent);
             specifyColor(intent);
         }
         return true;
     }
 
     private void specifyDefaultDisclaimers(Intent intent) {
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.O) {
+        if (Util.SDK_INT >= VERSION_CODES.O) {
             Bundle emmBundle = new Bundle();
             emmBundle.putString(DevicePolicyManager.EXTRA_PROVISIONING_DISCLAIMER_HEADER,
                     getString(R.string.default_disclaimer_emm_name));
@@ -334,7 +333,7 @@ private static Uri resourceToUri(Context context, int resID) {
     }
 
     private void specifySkipUserConsent(Intent intent) {
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.O
+        if (Util.SDK_INT >= VERSION_CODES.O
               && ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
               && mSkipUserConsent.getVisibility() == View.VISIBLE) {
             intent.putExtra(
@@ -344,7 +343,7 @@ private void specifySkipUserConsent(Intent intent) {
     }
 
     private void specifyKeepAccountMigrated(Intent intent) {
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.O
+        if (Util.SDK_INT >= VERSION_CODES.O
               && ACTION_PROVISION_MANAGED_PROFILE.equals(intent.getAction())
               && mKeepAccountMigrated.getVisibility() == View.VISIBLE) {
             intent.putExtra(DevicePolicyManager.EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION,

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

@@ -40,7 +40,7 @@ public static void showNotification(
     }
 
     public static NotificationCompat.Builder getNotificationBuilder(Context context) {
-        if (Build.VERSION.SDK_INT >= VERSION_CODES.O) {
+        if (Util.SDK_INT >= VERSION_CODES.O) {
             createDefaultNotificationChannel(context);
         }
         NotificationCompat.Builder builder

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

@@ -66,7 +66,7 @@ public View onCreateView(
 
             final boolean showDualTabs =
                 Util.isManagedProfileOwner(getActivity())
-                    && Build.VERSION.SDK_INT >= VERSION_CODES.N;
+                    && Util.SDK_INT >= VERSION_CODES.N;
 
             // Tab for the parent profile
             if (showDualTabs) {