Update for Android 11.

Author: jscott1989

app/build.gradle

@@ -5,13 +5,13 @@ ext {
     // 1 or more digits
     versionMajor = 6
     // exactly 1 digit
-    versionMinor = 1
+    versionMinor = 2
     // exactly 2 digits
     versionBuild = 02
 }
 
 android {
-    compileSdkVersion 'android-Q'
+    compileSdkVersion 'android-R'
     buildToolsVersion "28.0.0"
 
     defaultConfig {
@@ -49,6 +49,13 @@ android {
         textOutput "stdout"
     }
 
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -71,20 +78,28 @@ android {
         }
     }
 
-    task stripTestOnlyNormalDebug << {
-        stripTestOnlyForBuild("normal", "debug")
+    task stripTestOnlyNormalDebug {
+        doLast {
+            stripTestOnlyForBuild("normal", "debug")
+        }
     }
 
-    task stripTestOnlyNormalRelease << {
-        stripTestOnlyForBuild("normal", "release")
+    task stripTestOnlyNormalRelease {
+        doLast {
+            stripTestOnlyForBuild("normal", "release")
+        }
     }
 
-    task stripTestOnlyReplicaDebug << {
-        stripTestOnlyForBuild("replica", "debug")
+    task stripTestOnlyReplicaDebug {
+        doLast {
+            stripTestOnlyForBuild("replica", "debug")
+        }
     }
 
-    task stripTestOnlyReplicaRelease << {
-        stripTestOnlyForBuild("replica", "release")
+    task stripTestOnlyReplicaRelease {
+        doLast {
+            stripTestOnlyForBuild("replica", "release")
+        }
     }
 
     tasks.whenTaskAdded { task ->
@@ -122,7 +137,7 @@ private void stripTestOnlyForBuild(flavor, buildType) {
 dependencies {
     def lifecycle_version = "2.0.0"
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
-    implementation 'androidx.enterprise:enterprise-feedback:1.0.0-alpha01'
+    implementation 'androidx.enterprise:enterprise-feedback:1.0.0-alpha02'
     implementation 'androidx.multidex:multidex:2.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
@@ -132,6 +147,9 @@ dependencies {
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
     implementation 'org.bouncycastle:bcprov-jdk15on:1.56'
     implementation 'com.google.guava:guava:23.6-android'
-
+    testImplementation 'org.robolectric:robolectric:4.2'
+    testImplementation "com.google.truth:truth:0.44"
+    testImplementation 'junit:junit:4.5'
+    testImplementation 'androidx.test:core:1.0.0'
     annotationProcessor "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
 }

app/src/main/AndroidManifest.xml

@@ -30,6 +30,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.REQUEST_PASSWORD_COMPLEXITY"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application
             android:allowBackup="true"
@@ -40,11 +41,16 @@
       <activity
             android:name=".PolicyManagementActivity"
             android:label="@string/app_name"
+            android:exported="true"
             android:windowSoftInputMode="adjustPan">
         <intent-filter>
             <action android:name="android.intent.action.MAIN"/>
             <category android:name="android.intent.category.LAUNCHER"/>
         </intent-filter>
+        <intent-filter>
+            <action android:name="android.app.action.CHECK_POLICY_COMPLIANCE"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+        </intent-filter>
       </activity>
 
         <activity
@@ -99,7 +105,8 @@
 
         <activity android:name=".provision.DpcLoginActivity"
                 android:exported="true"
-                android:permission="android.permission.BIND_DEVICE_ADMIN">
+                android:permission="android.permission.BIND_DEVICE_ADMIN"
+                android:theme="@style/DpcLoginTheme">
             <intent-filter>
                 <action android:name="android.app.action.GET_PROVISIONING_MODE" />
                 <category android:name="android.intent.category.DEFAULT"/>

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

@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.afwsamples.testdpc.common;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionInfo;
+import android.os.Build.VERSION_CODES;
+import android.util.Log;
+import androidx.annotation.RequiresApi;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Checks that the requested permissions are present, and grants any dangerous
+ * permissions required.
+ */
+public class PermissionsHelper {
+
+  public static String TAG = "PermissionsHelper";
+
+  /**
+   * Ensures that the passed in permissions are defined in manifest and attempts to grant a
+   * permission automatically if it is considered dangerous.
+   */
+  @RequiresApi(VERSION_CODES.M)
+  public static boolean ensureRequiredPermissions(String[] requiredPermissions, ComponentName admin,
+      Context context) {
+    PackageInfo packageInfo;
+    try {
+      packageInfo =
+          context
+              .getPackageManager()
+              .getPackageInfo(context.getPackageName(), PackageManager.GET_PERMISSIONS);
+    } catch (NameNotFoundException e) {
+      Log.e(TAG, "Could not find own package.", e);
+      return false;
+    }
+    List<String> manifestPermissions = Arrays.asList(packageInfo.requestedPermissions);
+    for (String expectedPermission : requiredPermissions) {
+      if (!manifestPermissions.contains(expectedPermission)) {
+        Log.e(TAG, "Missing required permission from manifest: " + expectedPermission);
+        return false;
+      }
+      if (!maybeGrantDangerousPermission(expectedPermission, admin, context)){
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Attempts to grant a permission automatically if it is considered dangerous - this only happens
+   * for PO/DO devices.
+   */
+  @RequiresApi(VERSION_CODES.M)
+  private static boolean maybeGrantDangerousPermission(String permission, ComponentName admin,
+      Context context) {
+    if (!isPermissionDangerous(permission, context)) {
+      return true;
+    }
+    if (!ProvisioningStateUtil.isManagedByTestDPC(context)) {
+      return false;
+    }
+    if (hasPermissionGranted(admin, context, permission)) {
+      return true;
+    }
+    DevicePolicyManager devicePolicyManager = (DevicePolicyManager) context
+        .getSystemService(Context.DEVICE_POLICY_SERVICE);
+    return devicePolicyManager.setPermissionGrantState(
+        admin,
+        context.getPackageName(),
+        permission,
+        DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
+  }
+
+
+  // Min API version required for DevicePolicyManager.getPermissionGrantState
+  @RequiresApi(VERSION_CODES.M)
+  private static boolean hasPermissionGranted(
+      ComponentName componentName, Context context, String permission) {
+    DevicePolicyManager devicePolicyManager = context.getSystemService(DevicePolicyManager.class);
+    return devicePolicyManager
+        .getPermissionGrantState(componentName, context.getPackageName(), permission)
+        == DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED;
+  }
+
+  private static boolean isPermissionDangerous(String permission, Context context) {
+    PermissionInfo permissionInfo;
+    try {
+      permissionInfo = context.getPackageManager().getPermissionInfo(permission, 0);
+    } catch (NameNotFoundException e) {
+      Log.e(TAG, "Failed to look up permission.", e);
+      return false;
+    }
+    return permissionInfo != null
+        && (permissionInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE)
+        == PermissionInfo.PROTECTION_DANGEROUS;
+  }
+}

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

@@ -57,9 +57,11 @@ public class Util {
     private static final String GMSCORE_PACKAGE = "com.google.android.gms";
     private static final String PERSISTENT_DEVICE_OWNER_STATE = "persistentDeviceOwnerState";
 
-    // TODO:(133143789): Remove when we no longer need to support pre-release Q
-    private static final boolean IS_RUNNING_Q =
-        VERSION.CODENAME.length() == 1 && VERSION.CODENAME.charAt(0) == 'Q';
+    // TODO: Update to S when VERSION_CODES.R becomes available.
+    public static final int R_VERSION_CODE = 30;
+
+    private static final boolean IS_RUNNING_R =
+        VERSION.CODENAME.length() == 1 && VERSION.CODENAME.charAt(0) == 'R';
 
     public static final int Q_VERSION_CODE = 29;
 
@@ -69,7 +71,8 @@ public class Util {
      * <p>This will be set to the version SDK, or {@link VERSION_CODES.CUR_DEVELOPMENT} if the SDK
      * int is not yet assigned.
      **/
-    public static final int SDK_INT = IS_RUNNING_Q ? Q_VERSION_CODE : VERSION.SDK_INT;
+    public static final int SDK_INT =
+        IS_RUNNING_R ? VERSION_CODES.CUR_DEVELOPMENT : VERSION.SDK_INT;
 
     /**
      * Format a friendly datetime for the current locale according to device policy documentation.

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

@@ -29,6 +29,8 @@
 import android.view.View;
 import android.widget.TextView;
 import com.afwsamples.testdpc.R;
+import com.afwsamples.testdpc.common.ReflectionUtil;
+import com.afwsamples.testdpc.common.ReflectionUtil.ReflectionIsTemporaryException;
 import com.afwsamples.testdpc.common.Util;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -47,15 +49,18 @@
  */
 public class DpcPreferenceHelper {
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef(flag = true, value = {ADMIN_NONE, ADMIN_DEVICE_OWNER, ADMIN_PROFILE_OWNER})
+    @IntDef(flag = true, value = {ADMIN_NONE, ADMIN_DEVICE_OWNER, ADMIN_BYOD_PROFILE_OWNER,
+        ADMIN_ORG_OWNED_PROFILE_OWNER})
     public @interface AdminKind {}
     public static final int ADMIN_NONE = 0x1;
     public static final int ADMIN_DEVICE_OWNER = 0x2;
-    public static final int ADMIN_PROFILE_OWNER = 0x4;
-    public static final int ADMIN_ANY = ADMIN_NONE | ADMIN_DEVICE_OWNER | ADMIN_PROFILE_OWNER;
+    public static final int ADMIN_BYOD_PROFILE_OWNER = 0x4;
+    public static final int ADMIN_ORG_OWNED_PROFILE_OWNER = 0x8;
+    public static final int ADMIN_PROFILE_OWNER =
+        ADMIN_BYOD_PROFILE_OWNER | ADMIN_ORG_OWNED_PROFILE_OWNER;
+    public static final int ADMIN_ANY =
+        ADMIN_NONE | ADMIN_DEVICE_OWNER | ADMIN_PROFILE_OWNER | ADMIN_ORG_OWNED_PROFILE_OWNER;
     public static final int ADMIN_NOT_NONE = ADMIN_ANY & ~ADMIN_NONE;
-    public static final int ADMIN_NOT_DEVICE_OWNER = ADMIN_ANY & ~ADMIN_DEVICE_OWNER;
-    public static final int ADMIN_NOT_PROFILE_OWNER = ADMIN_ANY & ~ADMIN_PROFILE_OWNER;
     public static final @AdminKind int ADMIN_DEFAULT = ADMIN_NOT_NONE;
     public static final int NO_CUSTOM_CONSTRIANT = 0;
 
@@ -253,19 +258,27 @@ private int getCurrentAdmin() {
             return ADMIN_DEVICE_OWNER;
         }
         if (dpm.isProfileOwnerApp(packageName)) {
-            return ADMIN_PROFILE_OWNER;
+            Boolean orgOwned = Util.SDK_INT >= VERSION_CODES.R &&
+                    dpm.isOrganizationOwnedDeviceWithManagedProfile();
+            if (orgOwned) {
+                return ADMIN_ORG_OWNED_PROFILE_OWNER;
+            } else {
+                return ADMIN_PROFILE_OWNER;
+            }
         }
         return ADMIN_NONE;
     }
 
     private List<String> getCurrentDelegations() {
         if (Util.SDK_INT < VERSION_CODES.O) {
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
+
         final DevicePolicyManager dpm =
                 (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
         final String packageName = mContext.getPackageName();
-            return dpm.getDelegatedScopes(null, packageName);
+        return dpm.getDelegatedScopes(null, packageName);
+
     }
 
     private int getCurrentUser() {
@@ -302,7 +315,12 @@ private String getAdminConstraintSummary() {
         if (isEnabledForAdmin(ADMIN_DEVICE_OWNER)) {
             admins.add(mContext.getString(R.string.device_owner));
         }
-        if (isEnabledForAdmin(ADMIN_PROFILE_OWNER)) {
+        // Only add the org-owned profile message if the constraint is specific to org-owned profile
+        // and not all profile types, to reduce verbosity of the message.
+        if (isEnabledForAdmin(ADMIN_ORG_OWNED_PROFILE_OWNER) &&
+            !isEnabledForAdmin(ADMIN_PROFILE_OWNER)) {
+            admins.add(mContext.getString(R.string.org_owned_profile_owner));
+        } else if (isEnabledForAdmin(ADMIN_PROFILE_OWNER)) {
             admins.add(mContext.getString(R.string.profile_owner));
         }
         if (!TextUtils.isEmpty(mDelegationConstraint)) {