Fix BYOD isUsbDataSignalingEnabled failure

* Add device owner and profile owner
  of org-owned device check.

Bug: 186634129
Test: manual testing with TestDPC
Change-Id: I254a0113175845a1518cafd77cb97d8fcce7a8b0

Author: Alex Johnston

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

@@ -2758,12 +2758,14 @@ private void reloadCommonCriteriaModeUi() {
 
     @TargetApi(VERSION_CODES.S)
     private void reloadEnableUsbDataSignalingUi() {
-        try {
-            boolean enabled = ReflectionUtil.invoke(mDevicePolicyManager,
+        if (isOrganizationOwnedDevice()) {
+            try {
+                boolean enabled = ReflectionUtil.invoke(mDevicePolicyManager,
                     "isUsbDataSignalingEnabled");
-            mEnableUsbDataSignalingPreference.setChecked(enabled);
-        } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking isUsbDataSignalingEnabled", e);
+                mEnableUsbDataSignalingPreference.setChecked(enabled);
+            } catch (ReflectionIsTemporaryException e) {
+                Log.e(TAG, "Error invoking isUsbDataSignalingEnabled", e);
+            }
         }
     }
 
@@ -2793,12 +2795,7 @@ private void reloadSetAutoTimeUi() {
         if (Util.SDK_INT < VERSION_CODES.R) {
             return;
         }
-        boolean isOrgOwned =
-                mDevicePolicyManagerGateway.isOrganizationOwnedDeviceWithManagedProfile();
-
-        if (mDevicePolicyManager.isDeviceOwnerApp(mPackageName)
-                || (mDevicePolicyManager.isProfileOwnerApp(mPackageName)
-                && isOrgOwned)) {
+        if (isOrganizationOwnedDevice()) {
             boolean isAutoTime = mDevicePolicyManager.getAutoTimeEnabled(mAdminComponentName);
             mSetAutoTimePreference.setChecked(isAutoTime);
         }
@@ -2809,12 +2806,7 @@ private void reloadSetAutoTimeZoneUi() {
         if (Util.SDK_INT < VERSION_CODES.R) {
             return;
         }
-        boolean isOrgOwned =
-                mDevicePolicyManagerGateway.isOrganizationOwnedDeviceWithManagedProfile();
-
-        if (mDevicePolicyManager.isDeviceOwnerApp(mPackageName)
-                || (mDevicePolicyManager.isProfileOwnerApp(mPackageName)
-                && isOrgOwned)) {
+        if (isOrganizationOwnedDevice()) {
             boolean isAutoTimeZone = mDevicePolicyManager
                     .getAutoTimeZoneEnabled(mAdminComponentName);
             mSetAutoTimeZonePreference.setChecked(isAutoTimeZone);
@@ -4345,6 +4337,12 @@ private void factoryResetOrgOwnedDevice() {
                 (e) -> onErrorLog("wipeData", e));
     }
 
+    private boolean isOrganizationOwnedDevice() {
+        return mDevicePolicyManager.isDeviceOwnerApp(mPackageName)
+            || (mDevicePolicyManager.isProfileOwnerApp(mPackageName)
+            && mDevicePolicyManagerGateway.isOrganizationOwnedDeviceWithManagedProfile());
+    }
+
     private int validateDeviceOwnerBeforeO() {
         if (Util.SDK_INT < VERSION_CODES.O) {
             if (!mDevicePolicyManager.isDeviceOwnerApp(mPackageName)) {