commit 3a7d3fc60e1347ff9bdddb8040237e2818d67a0e
author Rubin Xu <rubinxu@google.com> Tue Nov 18 23:42:18 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 18 23:42:21 2014 +0000
tree f7ce93757d612c12c6fe98c43c2bc1d6fb153142
parent 0455174d347bf451e830584bc3f6f35c3c560282
parent d7892e71a85989a3afc6388d917ab9961a607f24

Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev

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

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 9e51849..c9c9f03 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3923,7 +3923,7 @@
         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;
             }
         }