Encapsulate xxxPreferentialNetworkServiceEnabled into gateway.

These methods are only available on Android S, so they need to be
accessed using reflection until such SDK is available.

Test: gradlew assembleDebug
Fixes: 186451999

Change-Id: I03d478b50c304ed8d98baaff633d426bb8ac96b6

Author: the-felipeal

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

@@ -283,6 +283,17 @@ void setUsbDataSignalingEnabled(boolean enabled, @NonNull Consumer<Void> onSucce
      */
     void setUsbDataSignalingEnabled(boolean enabled);
 
+    /**
+     * See {@link android.app.admin.DevicePolicyManager#setPreferentialNetworkServiceEnabled(ComponentName, boolean)}.
+     */
+    void setPreferentialNetworkServiceEnabled(boolean enabled,
+            @NonNull Consumer<Void> onSuccess, @NonNull Consumer<Exception> onError);
+
+    /**
+     * See {@link android.app.admin.DevicePolicyManager#isPreferentialNetworkServiceEnabled(ComponentName)}.
+     */
+    boolean isPreferentialNetworkServiceEnabled();
+
     /**
      * See {@link android.app.admin.DevicePolicyManager#setPackagesSuspended(ComponentName, String[], boolean)}.
      */

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

@@ -472,14 +472,17 @@ public boolean setPermittedInputMethods(List<String> packageNames, Consumer<Void
 
     @Override
     public void setUsbDataSignalingEnabled(boolean enabled, @NonNull Consumer<Void> onSuccess,
-        @NonNull Consumer<Exception> onError) {
+            @NonNull Consumer<Exception> onError) {
         Log.d(TAG, "setUsbDataSignalingEnabled(" + enabled + ")");
+        Util.requireAndroidS();
 
+        String method = "setUsbDataSignalingEnabled";
         try {
-            ReflectionUtil.invoke(mDevicePolicyManager, "setUsbDataSignalingEnabled",
-                new Class[]{Boolean.TYPE}, enabled);
+            // TODO(b/179160578): use proper method when available on SDK
+            ReflectionUtil.invoke(mDevicePolicyManager, method, new Class[]{Boolean.TYPE}, enabled);
             onSuccess.accept(null);
         } catch (Exception e) {
+            Log.wtf(TAG, "Error calling " + method + "()", e);
             onError.accept(e);
         }
     }
@@ -492,6 +495,37 @@ public void setUsbDataSignalingEnabled(boolean enabled) {
             (e) -> onErrorLog(e, message));
     }
 
+    @Override
+    public void setPreferentialNetworkServiceEnabled(boolean enabled, Consumer<Void> onSuccess,
+            Consumer<Exception> onError) {
+        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);
+            onSuccess.accept(null);
+        } catch (Exception e) {
+            Log.wtf(TAG, "Error calling " + method + "()", e);
+            onError.accept(e);
+        }
+    }
+
+    @Override
+    public boolean isPreferentialNetworkServiceEnabled() {
+        Util.requireAndroidS();
+
+        String method = "isPreferentialNetworkServiceEnabled";
+        try {
+            // TODO(b/179160578): use proper method when available on SDK
+            return (Boolean) ReflectionUtil.invoke(mUserManager, method);
+        } catch (ReflectionIsTemporaryException e) {
+            Log.wtf(TAG, "Error calling " + method + "()", e);
+            return false;
+        }
+    }
+
     @Override
     public void removeActiveAdmin(Consumer<Void> onSuccess, Consumer<Exception> onError) {
         Log.d(TAG, "removeActiveAdmin()");

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

@@ -613,7 +613,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         mPreferentialNetworkServiceSwitchPreference.setOnPreferenceChangeListener(this);
         if (mIsProfileOwner) {
             mPreferentialNetworkServiceSwitchPreference.setChecked(
-                isPreferentialNetworkServiceEnabled());
+                    mDevicePolicyManagerGateway.isPreferentialNetworkServiceEnabled());
         }
         findPreference(LOCK_SCREEN_POLICY_KEY).setOnPreferenceClickListener(this);
         findPreference(PASSWORD_CONSTRAINTS_KEY).setOnPreferenceClickListener(this);
@@ -845,27 +845,6 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         reloadPersonalAppsSuspendedUi();
     }
 
-    private boolean isPreferentialNetworkServiceEnabled() {
-        try {
-            //TODO: Call directly when the S SDK is available.
-            return (Boolean) ReflectionUtil.invoke(mDevicePolicyManager,
-                "isPreferentialNetworkServiceEnabled");
-        } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking isPreferentialNetworkServiceEnabled", e);
-        }
-        return false;
-    }
-
-    private void setPreferentialNetworkServiceEnabled(Boolean isEnabled) {
-        try {
-            //TODO: Call directly when the S SDK is available.
-            ReflectionUtil.invoke(mDevicePolicyManager, "setPreferentialNetworkServiceEnabled",
-                new Class[]{Boolean.TYPE}, isEnabled);
-        } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking setPreferentialNetworkServiceEnabled", e);
-        }
-    }
-
     @Override
     public void dump(String prefix, PrintWriter pw, String[] args) {
         // TODO(b/173541467): needs to compile against @SystemAPI SDK to get it
@@ -1590,8 +1569,11 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 reloadMuteAudioUi();
                 return true;
             case SET_GET_PREFERENTIAL_NETWORK_SERVICE_STATUS:
-                setPreferentialNetworkServiceEnabled((Boolean) newValue);
-                showToast(Boolean.toString(isPreferentialNetworkServiceEnabled()));
+                mDevicePolicyManagerGateway.setPreferentialNetworkServiceEnabled((Boolean) newValue,
+                        (v) -> onSuccessShowToastWithHardcodedMessage(
+                                "setPreferentialNetworkServiceEnabled(%b)",
+                                mDevicePolicyManagerGateway.isPreferentialNetworkServiceEnabled()),
+                        (e) -> onErrorLog("setPreferentialNetworkServiceEnabled", e));
                 return true;
             case STAY_ON_WHILE_PLUGGED_IN:
                 mDevicePolicyManager.setGlobalSetting(mAdminComponentName,
@@ -4416,6 +4398,13 @@ private void onSuccessShowToast(String method, int msgId, Object...args) {
         showToast(msgId, args);
     }
 
+    /**
+     * Used for messages not backed by resources.
+     */
+    private void onSuccessShowToastWithHardcodedMessage(String format, Object...args) {
+        showToast(String.format(format, args));
+    }
+
     private void onErrorShowToast(String method, int msgId, Object... args) {
         Log.e(TAG, method + "() failed");
         showToast(msgId, args);