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

Commit 91c6e44e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 756efea1 62cf5861

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -7636,6 +7636,7 @@ public class DevicePolicyManager { 
     * empty set if none have been set.

     * empty set if none have been set.

     */

     */

    public @NonNull Set<String> getAffiliationIds(@NonNull ComponentName admin) {

    public @NonNull Set<String> getAffiliationIds(@NonNull ComponentName admin) {

        throwIfParentInstance("getAffiliationIds");

        try {

        try {

            return new ArraySet<>(mService.getAffiliationIds(admin));

            return new ArraySet<>(mService.getAffiliationIds(admin));

        } catch (RemoteException e) {

        } catch (RemoteException e) {