Remove reflection.

Test: manual
Change-Id: I96b20840ecf3d2884e63417346b25be949082718

Author: jscott1989

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

@@ -122,42 +122,21 @@ public boolean isOrganizationOwnedDeviceWithManagedProfile() {
     public boolean isHeadlessSystemUserMode() {
         Util.requireAndroidS();
 
-        // TODO(b/179160578): use proper method when available on SDK
-        String method = "isHeadlessSystemUserMode";
-        try {
-            return ReflectionUtil.invoke(mUserManager, method);
-        } catch (ReflectionIsTemporaryException e) {
-            Log.wtf(TAG, "Error calling mUserManager." + method + "()", e);
-            return false;
-        }
+        return mUserManager.isHeadlessSystemUserMode();
     }
 
     @Override
     public boolean isUserForeground() {
         Util.requireAndroidS();
 
-        // TODO(b/179160578): use proper method when available on SDK
-        String method = "isUserForeground";
-        try {
-            return ReflectionUtil.invoke(mUserManager, method);
-        } catch (ReflectionIsTemporaryException e) {
-            Log.wtf(TAG, "Error calling mUserManager." + method + "()", e);
-            return false;
-        }
+        return mUserManager.isUserForeground();
     }
 
     @Override
     public List<UserHandle> listForegroundAffiliatedUsers() {
         Util.requireAndroidS();
 
-        // TODO(b/179160578): use proper method when available on SDK
-        String method = "listForegroundAffiliatedUsers";
-        try {
-            return ReflectionUtil.invoke(mDevicePolicyManager, method);
-        } catch (ReflectionIsTemporaryException e) {
-            Log.wtf(TAG, "Error calling mDevicePolicyManager." + method + "()", e);
-            return Collections.emptyList();
-        }
+        return mDevicePolicyManager.listForegroundAffiliatedUsers();
     }
 
     @Override
@@ -481,13 +460,11 @@ public void setUsbDataSignalingEnabled(boolean enabled, @NonNull Consumer<Void>
         Log.d(TAG, "setUsbDataSignalingEnabled(" + enabled + ")");
         Util.requireAndroidS();
 
-        String method = "setUsbDataSignalingEnabled";
         try {
-            // TODO(b/179160578): use proper method when available on SDK
-            ReflectionUtil.invoke(mDevicePolicyManager, method, new Class[]{Boolean.TYPE}, enabled);
+            mDevicePolicyManager.setUsbDataSignalingEnabled(enabled);
             onSuccess.accept(null);
         } catch (Exception e) {
-            Log.wtf(TAG, "Error calling " + method + "()", e);
+            Log.wtf(TAG, "Error calling setUsbDataSignalingEnabled()", e);
             onError.accept(e);
         }
     }
@@ -506,13 +483,11 @@ public void setPreferentialNetworkServiceEnabled(boolean enabled, Consumer<Void>
         Log.d(TAG, "setPreferentialNetworkServiceEnabled(" + enabled + ")");
         Util.requireAndroidS();
 
-        String method = "setPreferentialNetworkServiceEnabled";
         try {
-            // TODO(b/179160578): use proper method when available on SDK
-            ReflectionUtil.invoke(mDevicePolicyManager, method, new Class[]{Boolean.TYPE}, enabled);
+            mDevicePolicyManager.setPreferentialNetworkServiceEnabled(enabled);
             onSuccess.accept(null);
         } catch (Exception e) {
-            Log.wtf(TAG, "Error calling " + method + "()", e);
+            Log.wtf(TAG, "Error calling setPreferentialNetworkServiceEnabled()", e);
             onError.accept(e);
         }
     }
@@ -521,14 +496,7 @@ public void setPreferentialNetworkServiceEnabled(boolean enabled, Consumer<Void>
     public boolean isPreferentialNetworkServiceEnabled() {
         Util.requireAndroidS();
 
-        String method = "isPreferentialNetworkServiceEnabled";
-        try {
-            // TODO(b/179160578): use proper method when available on SDK
-            return (Boolean) ReflectionUtil.invoke(mDevicePolicyManager, method);
-        } catch (ReflectionIsTemporaryException e) {
-            Log.wtf(TAG, "Error calling " + method + "()", e);
-            return false;
-        }
+        return mDevicePolicyManager.isPreferentialNetworkServiceEnabled();
     }
 
     @Override

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

@@ -2505,14 +2505,7 @@ private void loadEnrollmentSpecificId() {
             return;
         }
 
-        String esid = "";
-        try {
-            //TODO: Call directly when the S SDK is available.
-            esid = ReflectionUtil.invoke(mDevicePolicyManager, "getEnrollmentSpecificId");
-        } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking getEnterpriseSpecificId", e);
-            esid = "Error";
-        }
+        String esid = mDevicePolicyManager.getEnrollmentSpecificId();
 
         enrollmentSpecificIdPreference.setSummary(esid);
     }
@@ -2552,13 +2545,7 @@ private void loadPasswordComplexity() {
 
     @TargetApi(VERSION_CODES.S)
     private int getRequiredComplexity(DevicePolicyManager dpm) {
-        try {
-            return ReflectionUtil.invoke(dpm, "getRequiredPasswordComplexity");
-        } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking getRequiredPasswordComplexity", e);
-        }
-
-        return DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
+        return dpm.getRequiredPasswordComplexity();
     }
 
     private void loadRequiredPasswordComplexity() {
@@ -2605,12 +2592,7 @@ private void setRequiredPasswordComplexityOnParent(int complexity) {
     // running older releases and obviates the need for a target sdk check here.
     @TargetApi(VERSION_CODES.S)
     private void setRequiredPasswordComplexity(DevicePolicyManager dpm, int complexity) {
-        try {
-            ReflectionUtil.invoke(dpm, "setRequiredPasswordComplexity",
-                    new Class[]{Integer.TYPE}, complexity);
-        } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking setRequiredPasswordComplexity", e);
-        }
+        dpm.setRequiredPasswordComplexity(complexity);
         loadPasswordCompliant();
         loadPasswordComplexity();
         loadRequiredPasswordComplexity();
@@ -2768,13 +2750,8 @@ private void reloadCommonCriteriaModeUi() {
     @TargetApi(VERSION_CODES.S)
     private void reloadEnableUsbDataSignalingUi() {
         if (isOrganizationOwnedDevice()) {
-            try {
-                boolean enabled = ReflectionUtil.invoke(mDevicePolicyManager,
-                    "isUsbDataSignalingEnabled");
-                mEnableUsbDataSignalingPreference.setChecked(enabled);
-            } catch (ReflectionIsTemporaryException e) {
-                Log.e(TAG, "Error invoking isUsbDataSignalingEnabled", e);
-            }
+            boolean enabled = mDevicePolicyManager.isUsbDataSignalingEnabled();
+            mEnableUsbDataSignalingPreference.setChecked(enabled);
         }
     }