From d7892e71a85989a3afc6388d917ab9961a607f24 Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Thu, 30 Oct 2014 17:57:23 +0000 Subject: [PATCH] Fix equality test in getProfileOwnerAdmin() The equality test should compare a ComponentName, which admin.info is not. Bug: 18186447 Change-Id: If984ae2e0da958889564ba30716d65245a78d60f --- .../android/server/devicepolicy/DevicePolicyManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 308fcd802b4fb..73c51f0e5b80d 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -3912,7 +3912,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; } }