Cleanup isManagedProfile

Change-Id: I97937b81560af7a497fda4523daaa3106da887a1
Fix: 36536209

Author: tony-mak

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

@@ -52,7 +52,7 @@ public void onReceive(Context context, Intent intent) {
         final String action = intent.getAction();
         Log.d(TAG, "Received: " + action);
 
-        if (!Util.isManagedProfile2(context)) {
+        if (!Util.isManagedProfileOwner(context)) {
             Log.d(TAG, "Not a Managed Profile case. Ignoring broadcast.");
             return;
         }

app/src/main/java/com/afwsamples/testdpc/common/ProfileOrParentFragment.java

@@ -23,11 +23,9 @@
 import android.content.Context;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.os.UserManager;
 import android.support.v13.app.FragmentTabHost;
 import android.support.v4.os.BuildCompat;
 import android.support.v7.preference.PreferenceManager;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -68,7 +66,7 @@ public View onCreateView(
             tabHost.setup(getActivity(), getChildFragmentManager(), View.generateViewId());
 
             final boolean showDualTabs =
-                    Util.isManagedProfile(getActivity()) && BuildCompat.isAtLeastN();
+                    Util.isManagedProfileOwner(getActivity()) && BuildCompat.isAtLeastN();
 
             // Tab for the parent profile
             if (showDualTabs) {

app/src/main/java/com/afwsamples/testdpc/common/Util.java

@@ -113,38 +113,24 @@ public static void updateImageView(Context context, ImageView imageView, Uri uri
         }
     }
 
-    /** Allows to distinguish between Managed Profile and Profile Owner */
+    /**
+     * Return {@code true} iff we are the profile owner of a managed profile.
+     * Note that profile owner can be in primary user and secondary user too.
+     */
     @TargetApi(VERSION_CODES.N)
-    public static boolean isManagedProfile(Context context) {
+    public static boolean isManagedProfileOwner(Context context) {
+        final DevicePolicyManager dpm = getDevicePolicyManager(context);
+
         if (BuildCompat.isAtLeastN()) {
-            DevicePolicyManager dpm = getDevicePolicyManager(context);
             try {
                 return dpm.isManagedProfile(DeviceAdminReceiver.getComponentName(context));
-            } catch (SecurityException e) {
-                // This is thrown if there is no active admin so not the managed profile
+            } catch (SecurityException ex) {
+                // This is thrown if we are neither profile owner nor device owner.
                 return false;
             }
-        } else {
-            // If user has more than one profile, then we deal with managed profile.
-            // Unfortunately there is no public API available to distinguish user profile owner
-            // and managed profile owner. Thus using this hack.
-            UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-            return userManager.getUserProfiles().size() > 1;
         }
-    }
-
-    /**
-     * TODO: unify with {@link Util#isManagedProfile} (there must be one 'correct' way)
-     * <p>
-     * TODO: consider setting a target version for the method
-     */
-    public static boolean isManagedProfile2(Context context) {
-        final DevicePolicyManager dpm = getDevicePolicyManager(context);
-
-        // On pre-N devices, the only supported PO flow is managed profile. On N+ devices we need
-        // to check whether we're running in a managed profile.
-        return dpm.isProfileOwnerApp(context.getPackageName())
-                && (!BuildCompat.isAtLeastN() || Util.isManagedProfile(context));
+        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        return isProfileOwner(context) && userManager.getUserProfiles().size() > 1;
     }
 
     @TargetApi(VERSION_CODES.M)

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

@@ -262,7 +262,7 @@ private int getCurrentUser() {
             return USER_PRIMARY_USER;
         }
 
-        if (Util.isManagedProfile(mContext)) {
+        if (Util.isManagedProfileOwner(mContext)) {
 
             return USER_MANAGED_PROFILE;
         }

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

@@ -813,9 +813,9 @@ private void showPendingSystemUpdate() {
 
     @TargetApi(Build.VERSION_CODES.O)
     private void lockNow() {
-        if (BuildCompat.isAtLeastO() && Util.isManagedProfile(getActivity())) {
+        if (BuildCompat.isAtLeastO() && Util.isManagedProfileOwner(getActivity())) {
             showLockNowPrompt();
-        } else if (BuildCompat.isAtLeastN() && Util.isManagedProfile(getActivity())) {
+        } else if (BuildCompat.isAtLeastN() && Util.isManagedProfileOwner(getActivity())) {
             // Always call lock now on the parent for managed profile on N
             mDevicePolicyManager.getParentProfileInstance(mAdminComponentName).lockNow();
         } else {
@@ -1559,7 +1559,7 @@ private void loadPasswordCompliant() {
 
         String summary;
         boolean compliant = mDevicePolicyManager.isActivePasswordSufficient();
-        if (Util.isManagedProfile(getActivity())) {
+        if (Util.isManagedProfileOwner(getActivity())) {
             DevicePolicyManager parentDpm
                     = mDevicePolicyManager.getParentProfileInstance(mAdminComponentName);
             boolean parentCompliant = parentDpm.isActivePasswordSufficient();

app/src/main/java/com/afwsamples/testdpc/profilepolicy/ProfilePolicyManagementFragment.java

@@ -128,7 +128,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
     @Override
     public boolean isAvailable(Context context) {
-        return Util.isManagedProfile(context);
+        return Util.isManagedProfileOwner(context);
     }
 
     @Override