diff options
| author | 2017-05-02 15:38:44 +0000 | |
|---|---|---|
| committer | 2017-05-02 15:38:48 +0000 | |
| commit | 91c6e44e9eddcff179d263221a75dfd4e47911cf (patch) | |
| tree | 8c1df048a34d0450c031b32c39d889d1ae7ffed8 | |
| parent | 756efea14503ef2c71ea3980308780862c4c941e (diff) | |
| parent | 62cf5861592dc283cbcdac43e70be786f19869ce (diff) | |
Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |