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

* commit 'f978e667a6395902be09f3dd6c5c6b8d17ce58da': Fix equality test in getProfileOwnerAdmin()
2014-11-19 00:24:09 +00:00
parent 22da9ba481 f978e667a6
commit dbf32fe93a
1 changed files with 1 additions and 1 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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;
            }
        }