Merge /usr/local/google/home/ascull/projects/ub-testdpc-oc-release/vendor/unbundled_google/packages/TestDPC into new-version

Author: AndrewScull

app/build.gradle

@@ -7,7 +7,7 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 02
+    versionBuild = 03
 }
 
 android {

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

@@ -129,8 +129,11 @@ public static boolean isManagedProfileOwner(Context context) {
                 return false;
             }
         }
-        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        return isProfileOwner(context) && userManager.getUserProfiles().size() > 1;
+
+        // Pre-N, TestDPC only supports being the profile owner for a managed profile. Other apps
+        // may support being a profile owner in other contexts (e.g. a secondary user) which will
+        // require further checks.
+        return isProfileOwner(context);
     }
 
     @TargetApi(VERSION_CODES.M)
@@ -207,4 +210,4 @@ public static boolean installCaCertificate(InputStream certificateInputStream,
     private static DevicePolicyManager getDevicePolicyManager(Context context) {
         return (DevicePolicyManager)context.getSystemService(Service.DEVICE_POLICY_SERVICE);
     }
-}
+}

app/src/main/java/com/afwsamples/testdpc/provision/PostProvisioningTask.java

@@ -73,7 +73,8 @@ public class PostProvisioningTask {
 
     public PostProvisioningTask(Context context) {
         mContext = context;
-        mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);
+        mDevicePolicyManager =
+                (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
         mSharedPrefs = context.getSharedPreferences(POST_PROV_PREFS, Context.MODE_PRIVATE);
     }