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

Commit 60d88ea3 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 

am: 1fe0c5ca

Change-Id: I2fb7103267fbcf76ede3f168b4d7b4892c501943
parents ac227b88 1fe0c5ca

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

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