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

Commit dbf32fe9 authored by Rubin Xu's avatar Rubin Xu Committed by Android Git Automerger
Browse files

am f978e667: am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in... 

am f978e667: am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev

* commit 'f978e667':
  Fix equality test in getProfileOwnerAdmin()
parents 22da9ba4 f978e667

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -3924,7 +3924,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        final int n = policy.mAdminList.size();

        for (int i = 0; i < n; i++) {

            ActiveAdmin admin = policy.mAdminList.get(i);

            if (profileOwner.equals(admin.info)) {

            if (profileOwner.equals(admin.info.getComponent())) {

                return admin;

            }

        }