Merge "Add back the throwIfParentInstance checking in getAffiliationIds" into oc-dev

am: 91c6e44e9e Change-Id: I360c03f15bf8a84d58100e371ed5528db6975f4d
2017-05-02 15:46:13 +00:00
parent 62c1e21a25 91c6e44e9e
commit 1fe0c5cae8
1 changed files with 1 additions and 0 deletions
--- 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) {