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

2017-05-02 15:38:44 +00:00
parent 756efea145 62cf586159
commit 91c6e44e9e
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) {