From 8c76056c1919857d82cf2fe70f02a84d909097b4 Mon Sep 17 00:00:00 2001
From: Charles He <qiurui@google.com>
Date: Tue, 25 Oct 2016 16:36:53 +0100
Subject: [PATCH] Update API whitelist supported by parent profile

1) Add #getPasswordMaximumLength() to the whitelist supported by the
parent profile
2) Throw SecurityException when #isAdminActive() is called on parent
profile

Change-Id: Idcc3ef48ce83963fcaa0259ec5f5781d95c83afa
Fixes: 32063080
Test: cts-tradefed run cts --module DevicePolicyManager --test com.android.cts.devicepolicy.ManagedProfileTest#testParentProfileApiDisabled
---
 core/java/android/app/admin/DevicePolicyManager.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 4ddcfe546f95c..692c7fdc520a8 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -1055,6 +1055,7 @@ public class DevicePolicyManager {
      *         otherwise
      */
     public boolean isAdminActive(@NonNull ComponentName admin) {
+        throwIfParentInstance("isAdminActive");
         return isAdminActiveAsUser(admin, myUserId());
     }
 
@@ -6140,6 +6141,7 @@ public class DevicePolicyManager {
      * <li>{@link #getPasswordExpirationTimeout}</li>
      * <li>{@link #setPasswordExpirationTimeout}</li>
      * <li>{@link #getPasswordExpiration}</li>
+     * <li>{@link #getPasswordMaximumLength}</li>
      * <li>{@link #isActivePasswordSufficient}</li>
      * <li>{@link #getCurrentFailedPasswordAttempts}</li>
      * <li>{@link #getMaximumFailedPasswordsForWipe}</li>