Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fe0c5ca authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

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

am: 91c6e44e

Change-Id: I360c03f15bf8a84d58100e371ed5528db6975f4d
parents 62c1e21a 91c6e44e

core/java/android/app/admin/DevicePolicyManager.java

+1 −0
Original line number Diff line number Diff line
@@ -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) {