diff options
| author | Rubin Xu <rubinxu@google.com> | 2014-10-30 17:57:23 +0000 |
|---|---|---|
| committer | Rubin Xu <rubinxu@google.com> | 2014-10-30 17:57:23 +0000 |
| commit | d7892e71a85989a3afc6388d917ab9961a607f24 (patch) | |
| tree | 59036a7640f9c6a0a7f7558ff71602d6112b9a34 /services/devicepolicy/java/com/android/server | |
| parent | d3a8c8aa530e6c1a605f469df7b378f688e7905a (diff) | |
| download | frameworks_base-d7892e71a85989a3afc6388d917ab9961a607f24.zip frameworks_base-d7892e71a85989a3afc6388d917ab9961a607f24.tar.gz frameworks_base-d7892e71a85989a3afc6388d917ab9961a607f24.tar.bz2 | |
Fix equality test in getProfileOwnerAdmin()
The equality test should compare a ComponentName, which admin.info is not.
Bug: 18186447
Change-Id: If984ae2e0da958889564ba30716d65245a78d60f
Diffstat (limited to 'services/devicepolicy/java/com/android/server')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 308fcd8..73c51f0 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; } } |