Change validateAffiliatedUserAfterP to not require DO before P.

This was added as the isAffiliatedUser method is only available from
P onwards. However support for affiliated PO calling these methods
exists from N.

This change will mean that on unaffiliated PO, the buttons will still
be enabled but will show a toast when pressed indicating that they
are not available. In other cases functionality will be as expected.

Also adds validateDeviceOwnerBeforeP for those functions where the
current use of validateAffiliatedUserAfterP is correct. This means
DpcPreference now supports multiple CustomConstraints at a time.

Bug: 110926860
Test: Manual. Tested on P that it is disabled for unaffiliated PO.
Enabled in other cases. Tested on O that it is enabled for PO and DO,
shows error toast when clicking while unaffiliated.

Change-Id: Icf84ba1eb1ad1bccd0ae627f3e23598e9860d2a5
(cherry picked from commit b10764d92004bb771e89b26f9bd445db926ec5d4)

Author: jscott1989

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

@@ -103,6 +103,11 @@ public void setCustomConstraint(@Nullable CustomConstraint customConstraint) {
         mHelper.setCustomConstraint(customConstraint);
     }
 
+    @Override
+    public void addCustomConstraint(@Nullable CustomConstraint customConstraint) {
+        mHelper.addCustomConstraint(customConstraint);
+    }
+
     @Override
     public void refreshEnabledState() {
         mHelper.disableIfConstraintsNotMet();

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

@@ -103,6 +103,11 @@ public void setCustomConstraint(@Nullable CustomConstraint customConstraint) {
         mHelper.setCustomConstraint(customConstraint);
     }
 
+    @Override
+    public void addCustomConstraint(@Nullable CustomConstraint customConstraint) {
+        mHelper.addCustomConstraint(customConstraint);
+    }
+
     @Override
     public void refreshEnabledState() {
         mHelper.disableIfConstraintsNotMet();

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

@@ -103,6 +103,11 @@ public void setCustomConstraint(@Nullable CustomConstraint customConstraint) {
         mHelper.setCustomConstraint(customConstraint);
     }
 
+    @Override
+    public void addCustomConstraint(@Nullable CustomConstraint customConstraint) {
+        mHelper.addCustomConstraint(customConstraint);
+    }
+
     @Override
     public void refreshEnabledState() {
         mHelper.disableIfConstraintsNotMet();

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

@@ -29,6 +29,7 @@ public interface DpcPreferenceBase {
     void clearUserConstraint();
     void clearNonCustomConstraints();
     void setCustomConstraint(@Nullable CustomConstraint customConstraint);
+    void addCustomConstraint(@Nullable CustomConstraint customConstraint);
     /**
      * To re-check is the constraint met and enable/disable the preference accordingly.
      */

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

@@ -81,7 +81,7 @@ public class DpcPreferenceHelper {
     private Preference mPreference;
 
     private CharSequence mConstraintViolationSummary = null;
-    private CustomConstraint mCustomConstraint = null;
+    private List<CustomConstraint> mCustomConstraints = new ArrayList<>();
     private int mMinSdkVersion;
     private @AdminKind int mAdminConstraint;
     private @UserKind int mUserConstraint;
@@ -194,19 +194,37 @@ public void clearNonCustomConstraints() {
     /**
      * Specify a custom constraint by setting a {{@link CustomConstraint}} object. The enabled
      * state of the preference will be updated accordingly.
+     *
+     * <p>This will remove all previously set custom constraints. If you do not want to do this, use
+     * {@link #addCustomConstraint(CustomConstraint)}.
      */
     public void setCustomConstraint(CustomConstraint customConstraint) {
-        mCustomConstraint = customConstraint;
+        clearCustomConstraints();
+        addCustomConstraint(customConstraint);
+    }
+
+    /**
+     * Add a {@link CustomConstraint} to be evaluated in addition to existing custom constraints.
+     *
+     * <p>The enabled state of the preference will be updated accordingly.
+     *
+     * <p>The new constraint will be enforced in addition to any previously set custom constraints.
+     * If you'd prefer that this constraint replaces previous constraints,
+     * use {@link #setCustomConstraint(CustomConstraint)}.
+     */
+    public void addCustomConstraint(CustomConstraint customConstraint) {
+        mCustomConstraints.add(customConstraint);
         disableIfConstraintsNotMet();
     }
 
     /**
-     * Remove any custom constraints set by {@link #setCustomConstraint(CustomConstraint)}.
-     * <p/>
-     * This method is safe to call if there is no current custom constraint.
+     * Remove any custom constraints set by {@link #setCustomConstraint(CustomConstraint)} and
+     * {@link #addCustomConstraint(CustomConstraint)}.
+     *
+     * <p>This method is safe to call if there is no current custom constraint.
      */
-    public void clearCustomConstraint() {
-        setCustomConstraint(null);
+    public void clearCustomConstraints() {
+        mCustomConstraints.clear();
     }
 
     public void disableIfConstraintsNotMet() {
@@ -233,8 +251,8 @@ private CharSequence findConstraintViolation() {
             return getUserConstraintSummary();
         }
 
-        if (mCustomConstraint != null) {
-            @StringRes int strRes = mCustomConstraint.validateConstraint();
+        for (CustomConstraint customConstraint : mCustomConstraints) {
+            @StringRes int strRes = customConstraint.validateConstraint();
             if (strRes != NO_CUSTOM_CONSTRIANT) {
                 return mContext.getString(strRes);
             }

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

@@ -103,6 +103,11 @@ public void setCustomConstraint(@Nullable CustomConstraint customConstraint) {
         mHelper.setCustomConstraint(customConstraint);
     }
 
+    @Override
+    public void addCustomConstraint(@Nullable CustomConstraint customConstraint) {
+        mHelper.addCustomConstraint(customConstraint);
+    }
+
     @Override
     public void refreshEnabledState() {
         mHelper.disableIfConstraintsNotMet();

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

@@ -49,6 +49,7 @@
 import android.os.AsyncTask;
 import android.os.BatteryManager;
 import android.os.Build;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -545,15 +546,19 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         mDisableStatusBarPreference = (DpcPreference) findPreference(DISABLE_STATUS_BAR);
         mDisableStatusBarPreference.setOnPreferenceClickListener(this);
         mDisableStatusBarPreference.setCustomConstraint(this::validateAffiliatedUserAfterP);
+        mDisableStatusBarPreference.addCustomConstraint(this::validateDeviceOwnerBeforeP);
         mReenableStatusBarPreference = (DpcPreference) findPreference(REENABLE_STATUS_BAR);
         mReenableStatusBarPreference.setOnPreferenceClickListener(this);
         mReenableStatusBarPreference.setCustomConstraint(this::validateAffiliatedUserAfterP);
+        mReenableStatusBarPreference.addCustomConstraint(this::validateDeviceOwnerBeforeP);
         mDisableKeyguardPreference = (DpcPreference) findPreference(DISABLE_KEYGUARD);
         mDisableKeyguardPreference.setOnPreferenceClickListener(this);
         mDisableKeyguardPreference.setCustomConstraint(this::validateAffiliatedUserAfterP);
+        mDisableKeyguardPreference.addCustomConstraint(this::validateDeviceOwnerBeforeP);
         mReenableKeyguardPreference = (DpcPreference) findPreference(REENABLE_KEYGUARD);
         mReenableKeyguardPreference.setOnPreferenceClickListener(this);
         mReenableKeyguardPreference.setCustomConstraint(this::validateAffiliatedUserAfterP);
+        mReenableKeyguardPreference.addCustomConstraint(this::validateDeviceOwnerBeforeP);
         findPreference(START_KIOSK_MODE).setOnPreferenceClickListener(this);
         mStayOnWhilePluggedInSwitchPreference = (SwitchPreference) findPreference(
                 STAY_ON_WHILE_PLUGGED_IN);
@@ -3575,19 +3580,21 @@ private void removeAccount(Account account) {
 
     @TargetApi(28)
     private int validateAffiliatedUserAfterP() {
-        if (BuildCompat.isAtLeastP()) {
-            if (mDevicePolicyManager.isAffiliatedUser()) {
-                return NO_CUSTOM_CONSTRIANT;
-            } else {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            if (!mDevicePolicyManager.isAffiliatedUser()) {
                 return R.string.require_affiliated_user;
             }
-        } else {
-            if (mDevicePolicyManager.isDeviceOwnerApp(mPackageName)) {
-               return NO_CUSTOM_CONSTRIANT;
-            } else {
+        }
+        return NO_CUSTOM_CONSTRIANT;
+    }
+
+    private int validateDeviceOwnerBeforeP() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            if (!mDevicePolicyManager.isDeviceOwnerApp(mPackageName)) {
                 return R.string.requires_device_owner;
             }
         }
+        return NO_CUSTOM_CONSTRIANT;
     }
 
     abstract class ManageLockTaskListCallback {