Merge cherrypicks of [7894870, 7894603, 7894604] into ub-testdpc-qt-release

Change-Id: I2e4a657698d8ec675c81a836a3260739c3e6b285

Author: android-build-team Robot

app/build.gradle

@@ -9,11 +9,11 @@ ext {
     // exactly 1 digit
     versionMinor = 1
     // exactly 2 digits
-    versionBuild = 00
+    versionBuild = 02
 }
 
 android {
-    compileSdkVersion 'android-29'
+    compileSdkVersion 'android-Q'
     buildToolsVersion "28.0.0"
 
     defaultConfig {

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

@@ -16,13 +16,15 @@
 
 package com.afwsamples.testdpc;
 
+import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
+
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build.VERSION_CODES;
 
-@TargetApi(VERSION_CODES.Q)
+@TargetApi(Q_VERSION_CODE)
 public class DelegatedAdminReceiver extends android.app.admin.DelegatedAdminReceiver {
 
     @Override

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

@@ -61,13 +61,15 @@ public class Util {
     private static final boolean IS_RUNNING_Q =
         VERSION.CODENAME.length() == 1 && VERSION.CODENAME.charAt(0) == 'Q';
 
+    public static final int Q_VERSION_CODE = 29;
+
     /**
      * A replacement for {@link VERSION.SDK_INT} that is compatible with pre-release SDKs
      *
      * <p>This will be set to the version SDK, or {@link VERSION_CODES.CUR_DEVELOPMENT} if the SDK
      * int is not yet assigned.
      **/
-    public static final int SDK_INT = IS_RUNNING_Q ? VERSION_CODES.Q : VERSION.SDK_INT;
+    public static final int SDK_INT = IS_RUNNING_Q ? Q_VERSION_CODE : VERSION.SDK_INT;
 
     /**
      * Format a friendly datetime for the current locale according to device policy documentation.

app/src/main/java/com/afwsamples/testdpc/policy/CrossProfileCalendarFragment.java

@@ -16,6 +16,8 @@
 
 package com.afwsamples.testdpc.policy;
 
+import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
+
 import android.annotation.TargetApi;
 import android.app.AlertDialog.Builder;
 import android.app.admin.DevicePolicyManager;
@@ -36,7 +38,7 @@
 import java.util.Collections;
 import java.util.Set;
 
-@TargetApi(VERSION_CODES.Q)
+@TargetApi(Q_VERSION_CODE)
 public class CrossProfileCalendarFragment extends BaseSearchablePolicyPreferenceFragment implements
     Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener {
 
@@ -102,7 +104,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         return false;
     }
 
-    @TargetApi(VERSION_CODES.Q)
+    @TargetApi(Q_VERSION_CODE)
     private void reloadAllowAllPackagesUi() {
         final Set<String> packages =
             mDevicePolicyManager.getCrossProfileCalendarPackages(mAdminComponentName);

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -17,6 +17,7 @@
 package com.afwsamples.testdpc.policy;
 
 import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
+import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
 import static com.afwsamples.testdpc.common.preference.DpcPreferenceHelper.NO_CUSTOM_CONSTRIANT;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
@@ -398,7 +399,7 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
 
     private static final SparseIntArray PASSWORD_COMPLEXITY = new SparseIntArray(4);
     static {
-        if (Util.SDK_INT >= VERSION_CODES.Q) {
+        if (Util.SDK_INT >= Q_VERSION_CODE) {
             final int[] complexityIds = new int[]{
                 DevicePolicyManager.PASSWORD_COMPLEXITY_NONE,
                 DevicePolicyManager.PASSWORD_COMPLEXITY_LOW,
@@ -1141,7 +1142,7 @@ public void onPositiveButtonClicked(String[] lockTaskArray) {
         return false;
     }
 
-    @TargetApi(VERSION_CODES.Q)
+    @TargetApi(Q_VERSION_CODE)
     private void promptInstallUpdate() {
         new AlertDialog.Builder(getActivity())
                 .setMessage(R.string.install_update_prompt)
@@ -1154,7 +1155,7 @@ private void promptInstallUpdate() {
                 .show();
     }
 
-    @TargetApi(VERSION_CODES.Q)
+    @TargetApi(Q_VERSION_CODE)
     private void installUpdate() {
         File file = new File(getContext().getFilesDir(), "ota.zip");
         Uri uri = FileProvider.getUriForFile(

app/src/main/java/com/afwsamples/testdpc/policy/UserRestrictionsDisplayFragment.java

@@ -17,6 +17,7 @@
 package com.afwsamples.testdpc.policy;
 
 import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
+import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
 
 import android.app.AlertDialog;
 import android.app.admin.DevicePolicyManager;
@@ -150,7 +151,7 @@ private void constrainPreferences() {
         }
         for (String restriction: UserRestriction.QT_PLUS_RESTRICTIONS) {
             DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);
-            pref.setMinSdkVersion(VERSION_CODES.Q);
+            pref.setMinSdkVersion(Q_VERSION_CODE);
         }
         for (String restriction : UserRestriction.PRIMARY_USER_ONLY_RESTRICTIONS) {
             DpcPreferenceBase pref = (DpcPreferenceBase) findPreference(restriction);

app/src/main/java/com/afwsamples/testdpc/policy/networking/AlwaysOnVpnFragment.java

@@ -16,6 +16,8 @@
 
 package com.afwsamples.testdpc.policy.networking;
 
+import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
+
 import android.annotation.TargetApi;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
@@ -83,7 +85,7 @@ public View onCreateView(LayoutInflater layoutInflater, ViewGroup container,
             Bundle savedInstanceState) {
         final View view = super.onCreateView(layoutInflater, container, savedInstanceState);
 
-        if (Util.SDK_INT >= VERSION_CODES.Q) {
+        if (Util.SDK_INT >= Q_VERSION_CODE) {
             final ViewGroup extension = getExtensionLayout(view);
             extension.setVisibility(View.VISIBLE);
             layoutInflater.inflate(R.layout.lockdown_settings, extension);
@@ -112,12 +114,12 @@ protected List<String> createAppList() {
     @Override
     protected void reloadSelectedPackage() {
         super.reloadSelectedPackage();
-        if (Util.SDK_INT >= VERSION_CODES.Q) {
+        if (Util.SDK_INT >= Q_VERSION_CODE) {
             updateLockdown();
         }
     }
 
-    @TargetApi(VERSION_CODES.Q)
+    @TargetApi(Q_VERSION_CODE)
     private void updateLockdown() {
         mLockdown.setChecked(mDpm.isAlwaysOnVpnLockdownEnabled(mWho));
         final Set<String> exemptedPackages = mDpm.getAlwaysOnVpnLockdownWhitelist(mWho);
@@ -128,7 +130,7 @@ private void updateLockdown() {
     @Override
     protected void setSelectedPackage(String pkg) {
         try {
-            if (Util.SDK_INT >= VERSION_CODES.Q) {
+            if (Util.SDK_INT >= Q_VERSION_CODE) {
                 setAlwaysOnVpnPackageQPlus(pkg);
             } else {
                 mDpm.setAlwaysOnVpnPackage(mWho, pkg, /* lockdownEnabled */ true);
@@ -144,7 +146,7 @@ protected void setSelectedPackage(String pkg) {
         }
     }
 
-    @TargetApi(VERSION_CODES.Q)
+    @TargetApi(Q_VERSION_CODE)
     private void setAlwaysOnVpnPackageQPlus(String pkg)
             throws PackageManager.NameNotFoundException {
         final boolean lockdown = mLockdown.isChecked();

app/src/main/java/com/afwsamples/testdpc/policy/networking/PrivateDnsModeFragment.java

@@ -16,6 +16,8 @@
 
 package com.afwsamples.testdpc.policy.networking;
 
+import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
+
 import android.annotation.TargetApi;
 import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
@@ -35,7 +37,7 @@
 import com.afwsamples.testdpc.DeviceAdminReceiver;
 import com.afwsamples.testdpc.R;
 
-@TargetApi(VERSION_CODES.Q)
+@TargetApi(Q_VERSION_CODE)
 public class PrivateDnsModeFragment extends Fragment implements View.OnClickListener,
         RadioGroup.OnCheckedChangeListener {
     private static final String TAG = "PDNS_FRAG";

app/src/main/java/com/afwsamples/testdpc/policy/networking/SetPrivateDnsTask.java

@@ -16,6 +16,8 @@
 
 package com.afwsamples.testdpc.policy.networking;
 
+import static com.afwsamples.testdpc.common.Util.Q_VERSION_CODE;
+
 import android.annotation.TargetApi;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
@@ -25,7 +27,7 @@
 import com.afwsamples.testdpc.R;
 import com.afwsamples.testdpc.policy.keymanagement.ShowToastCallback;
 
-@TargetApi(VERSION_CODES.Q)
+@TargetApi(Q_VERSION_CODE)
 final class SetPrivateDnsTask extends AsyncTask<Void, Void, String> {
     public static final String TAG = "Networking";
     private final ShowToastCallback mCallback;