From 62cf5861592dc283cbcdac43e70be786f19869ce Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Tue, 2 May 2017 13:50:18 +0100 Subject: [PATCH] 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 --- core/java/android/app/admin/DevicePolicyManager.java | 1 + 1 file changed, 1 insertion(+) 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 getAffiliationIds(@NonNull ComponentName admin) { + throwIfParentInstance("getAffiliationIds"); try { return new ArraySet<>(mService.getAffiliationIds(admin)); } catch (RemoteException e) { -- 2.11.0