From: Tony Mak <tonymak@google.com>
Date: Tue, 2 May 2017 12:50:18 +0000 (+0100)
Subject: Add back the throwIfParentInstance checking in getAffiliationIds
X-Git-Tag: android-x86-9.0-r1~1044^2~1147^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=62cf5861592dc283cbcdac43e70be786f19869ce;p=android-x86%2Fframeworks-base.git

Add back the throwIfParentInstance checking in getAffiliationIds

Fix: 37887947

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ParentProfileTest#testParentProfileApiDisabled

Change-Id: I05944c7a2447998d3ea948195fb25b09ab9735fc
---

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 9b1b6cdfc3ce..109b5bb35b5a 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -7636,6 +7636,7 @@ public class DevicePolicyManager {
      * empty set if none have been set.
      */
     public @NonNull Set<String> getAffiliationIds(@NonNull ComponentName admin) {
+        throwIfParentInstance("getAffiliationIds");
         try {
             return new ArraySet<>(mService.getAffiliationIds(admin));
         } catch (RemoteException e) {