Merge "Is organization-owned: Use stable API" into ub-testdpc-rvc

Author: eranmes

app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java

@@ -257,13 +257,7 @@ private int getCurrentAdmin() {
         if (dpm.isDeviceOwnerApp(packageName)) {
             return ADMIN_DEVICE_OWNER;
         }
-        Boolean orgOwned;
-        try {
-            orgOwned = (Boolean) ReflectionUtil.invoke(dpm,
-                "isOrganizationOwnedDeviceWithManagedProfile");
-        } catch (ReflectionIsTemporaryException e) {
-            orgOwned = false;
-        }
+        Boolean orgOwned = dpm.isOrganizationOwnedDeviceWithManagedProfile();
         if (dpm.isProfileOwnerApp(packageName)) {
             if (orgOwned) {
                 return ADMIN_ORG_OWNED_PROFILE_OWNER;

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

@@ -2370,8 +2370,9 @@ private void loadAppFeedbackNotifications() {
 
     private void loadAppStatus() {
         final @StringRes int appStatusStringId;
+        boolean isOrgOwned = mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile();
         if (mDevicePolicyManager.isProfileOwnerApp(mPackageName)) {
-            if (isOrganizationOwnedDeviceWithManagedProfile()) {
+            if (mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()) {
                 appStatusStringId = R.string.this_is_an_org_owned_profile_owner;
             } else {
                 appStatusStringId = R.string.this_is_a_profile_owner;
@@ -4054,17 +4055,6 @@ private int validateDeviceOwnerBeforeQ() {
         return NO_CUSTOM_CONSTRIANT;
     }
 
-    // TODO: nuke it when R sdk is available
-    private boolean isOrganizationOwnedDeviceWithManagedProfile() {
-        try {
-            return (Boolean) ReflectionUtil.invoke(
-                    mDevicePolicyManager, "isOrganizationOwnedDeviceWithManagedProfile");
-        } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking isOrganizationOwnedDeviceWithManagedProfile", e);
-            return false;
-        }
-    }
-
     abstract static class ManageLockTaskListCallback {
         public abstract void onPositiveButtonClicked(String[] lockTaskArray);
     }