Rollback commits to fix build for external SDK

Change-Id: I05f113777882016188a246ca2918c8f35f29e208
(cherry picked from commit f54f6d3bd0df21ac70d204a59fee6487f1ad2a09)

Author: jscott1989

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

@@ -120,10 +120,10 @@ protected void reloadSelectedPackage() {
         }
     }
 
-    @TargetApi(29)
+    @TargetApi(Build.VERSION_CODES.Q)
     private void updateLockdown() {
         mLockdown.setChecked(mDpm.isAlwaysOnVpnLockdownEnabled(mWho));
-        final Set<String> exemptedPackages = mDpm.getAlwaysOnVpnLockdownWhitelist(mWho);
+        final List<String> exemptedPackages = mDpm.getAlwaysOnVpnLockdownWhitelist(mWho);
         mExemptedPackages.setText(
                 exemptedPackages != null ? String.join(",", exemptedPackages) : "");
     }
@@ -147,15 +147,15 @@ protected void setSelectedPackage(String pkg) {
         }
     }
 
-    @TargetApi(29)
+    @TargetApi(Build.VERSION_CODES.Q)
     private void setAlwaysOnVpnPackageQPlus(String pkg)
             throws PackageManager.NameNotFoundException {
         final boolean lockdown = mLockdown.isChecked();
-        final Set<String> packages = lockdown ?
+        final List<String> packages = lockdown ?
                 Arrays.stream(mExemptedPackages.getText().toString().split(","))
                         .map(String::trim)
                         .filter(s -> !s.isEmpty())
-                        .collect(Collectors.toSet())
+                        .collect(Collectors.toList())
                 : null;
         mDpm.setAlwaysOnVpnPackage(mWho, pkg, lockdown, packages);
     }

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

@@ -105,20 +105,16 @@ private void updateSelectedMode(int checkedId) {
         switch (checkedId) {
             case R.id.private_dns_mode_off:
                 mSelectedMode = PRIVATE_DNS_MODE_OFF;
-                mSetButton.setEnabled(false);
                 break;
             case R.id.private_dns_mode_automatic:
                 mSelectedMode = PRIVATE_DNS_MODE_OPPORTUNISTIC;
-                mSetButton.setEnabled(true);
                 break;
             case R.id.private_dns_mode_specific_host:
                 mSelectedMode = PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
-                mSetButton.setEnabled(true);
                 break;
             case R.id.private_dns_mode_unknown:
             default:
                 mSelectedMode = PRIVATE_DNS_MODE_UNKNOWN;
-                mSetButton.setEnabled(false);
                 break;
         }
     }

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

@@ -47,27 +47,8 @@ public SetPrivateDnsTask(
     @Override
     protected String doInBackground(Void... params) {
         try {
-            final int result;
-            switch (mMode) {
-                case DevicePolicyManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME:
-                    result = mDpm.setGlobalPrivateDnsModeSpecifiedHost(mComponent, mResolver);
-                    break;
-                case DevicePolicyManager.PRIVATE_DNS_MODE_OPPORTUNISTIC:
-                    result = mDpm.setGlobalPrivateDnsModeOpportunistic(mComponent);
-                    break;
-                default:
-                    throw new IllegalArgumentException("Invalid private dns mode: " + mMode);
-            }
-            switch (result) {
-                case DevicePolicyManager.PRIVATE_DNS_SET_NO_ERROR:
-                    return null;
-                case DevicePolicyManager.PRIVATE_DNS_SET_ERROR_FAILURE_SETTING:
-                    return "General failure to set the Private DNS mode";
-                case DevicePolicyManager.PRIVATE_DNS_SET_ERROR_HOST_NOT_SERVING:
-                    return "Provided host doesn't serve DNS-over-TLS";
-                default:
-                    return "Unexpected error setting private dns: " + result;
-            }
+            mDpm.setGlobalPrivateDns(mComponent, mMode, mResolver);
+            return null;
         } catch (SecurityException | IllegalArgumentException e) {
             Log.w(TAG, "Failed to invoke, cause", e);
             return e.getMessage();