Replace hardcoded strings with Q SDK APIs

Also fix a bug where DO-only delegations are not showing up in the list
on TestDPC replica when it's a delegated app.

Bug: 122460462
Test: manual
Change-Id: Id2626420bbf2dc135610f79cd37ac1afa9a73ab9

Author: Rubin Xu

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

@@ -16,46 +16,25 @@
 
 package com.afwsamples.testdpc;
 
-import android.content.BroadcastReceiver;
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.util.Log;
+import android.os.Build;
 
-//TODO(b/122460462) Revert to android.app.admin.DelegatedAdminReceiver once we have a new SDK drop.
-public class DelegatedAdminReceiver extends BroadcastReceiver {
+@TargetApi(Build.VERSION_CODES.Q)
+public class DelegatedAdminReceiver extends android.app.admin.DelegatedAdminReceiver {
 
-    //@Override
+    @Override
     public String onChoosePrivateKeyAlias(Context context, Intent intent, int uid, Uri uri,
                                           String alias) {
         return CommonReceiverOperations.onChoosePrivateKeyAlias(context, uid);
     }
 
-    //@Override
+    @Override
     public void onNetworkLogsAvailable(Context context, Intent intent, long batchToken,
                                        int networkLogsCount) {
         CommonReceiverOperations.onNetworkLogsAvailable(context, null, batchToken,
                 networkLogsCount);
     }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        String action = intent.getAction();
-
-        if ("android.app.action.CHOOSE_PRIVATE_KEY_ALIAS".equals(action)) {
-            int uid = intent.getIntExtra("android.app.extra.CHOOSE_PRIVATE_KEY_SENDER_UID", -1);
-            Uri uri = intent.getParcelableExtra("android.app.extra.CHOOSE_PRIVATE_KEY_URI");
-            String alias = intent.getStringExtra("android.app.extra.CHOOSE_PRIVATE_KEY_ALIAS");
-            String chosenAlias = onChoosePrivateKeyAlias(context, intent, uid, uri, alias);
-            setResultData(chosenAlias);
-        } else if ("android.app.action.NETWORK_LOGS_AVAILABLE".equals(action)) {
-            long batchToken = intent.getLongExtra("android.app.extra.EXTRA_NETWORK_LOGS_TOKEN", -1);
-            int networkLogsCount = intent.getIntExtra("android.app.extra.EXTRA_NETWORK_LOGS_COUNT",
-                    0);
-            onNetworkLogsAvailable(context, intent, batchToken, networkLogsCount);
-        } else {
-            Log.w("DelegatedReceiver", "Unhandled broadcast: " + action);
-        }
-
-    }
 }

app/src/main/java/com/afwsamples/testdpc/profilepolicy/delegation/DelegationFragment.java

@@ -63,7 +63,9 @@ public void onCreate(Bundle savedInstanceState) {
         final boolean isProfileOwner = mDpm.isProfileOwnerApp(mPackageName);
         mIsDeviceOrProfileOwner = isDeviceOwner || isProfileOwner;
 
-        mDelegations = DelegationScope.defaultDelegationScopes(isDeviceOwner);
+        // Show DO-only delegations if we are DO or delegated app i.e. we are not PO, ignoring the
+        // case where we are neither PO or DO (in which case this fragment is not accessible at all)
+        mDelegations = DelegationScope.defaultDelegationScopes(!isProfileOwner);
 
         getActivity().getActionBar().setTitle(R.string.generic_delegation);
     }
@@ -194,7 +196,7 @@ static class DelegationScope {
         }
 
         @TargetApi(Build.VERSION_CODES.O)
-        static List<DelegationScope> defaultDelegationScopes(boolean isDeviceOwner) {
+        static List<DelegationScope> defaultDelegationScopes(boolean showDoOnlyDelegations) {
             List<DelegationScope> defaultDelegations = new ArrayList<>();
             defaultDelegations.add(
                     new DelegationScope(DevicePolicyManager.DELEGATION_CERT_INSTALL));
@@ -209,12 +211,12 @@ static List<DelegationScope> defaultDelegationScopes(boolean isDeviceOwner) {
             defaultDelegations.add(
                     new DelegationScope(DevicePolicyManager.DELEGATION_ENABLE_SYSTEM_APP));
             defaultDelegations.add(
-                    new DelegationScope("delegation-cert-selection")); //TODO: b/122460462
-            if (isDeviceOwner) {
+                    new DelegationScope(DevicePolicyManager.DELEGATION_CERT_SELECTION));
+            if (showDoOnlyDelegations) {
                 defaultDelegations.add(
-                        new DelegationScope("delegation-network-logging")); //TODO: b/122460462
+                        new DelegationScope(DevicePolicyManager.DELEGATION_NETWORK_LOGGING));
                 defaultDelegations.add(
-                        new DelegationScope("delegation-package-installation")); //TODO: b/122460462
+                        new DelegationScope(DevicePolicyManager.DELEGATION_PACKAGE_INSTALLATION));
             }
             return defaultDelegations;
         }

app/src/main/java/com/afwsamples/testdpc/profilepolicy/delegation/DelegationScopesArrayAdapter.java

@@ -59,13 +59,13 @@ public View getView(int position, View convertView, ViewGroup parent) {
             case DevicePolicyManager.DELEGATION_ENABLE_SYSTEM_APP:
                 viewHolder.setText(R.string.delegation_scope_enable_system_app);
                 break;
-            case "delegation-network-logging": //TODO: b/122460462
+            case DevicePolicyManager.DELEGATION_NETWORK_LOGGING:
                 viewHolder.setText(R.string.delegation_scope_network_logging);
                 break;
-            case "delegation-cert-selection": //TODO: b/122460462
+            case DevicePolicyManager.DELEGATION_CERT_SELECTION:
                 viewHolder.setText(R.string.delegation_scope_cert_selection);
                 break;
-            case "delegation-package-installation": //TODO: b/122460462
+            case DevicePolicyManager.DELEGATION_PACKAGE_INSTALLATION:
                 viewHolder.setText(R.string.delegation_scope_package_installation);
                 break;