Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '0122db0a6397f5bd08042e1a5919114e3cccb9f4':
  Fix equality test in getProfileOwnerAdmin()
This commit is contained in:
Rubin Xu
2014-11-19 00:19:43 +00:00
committed by Android Git Automerger
parent 51888ef85d 0122db0a63
commit f978e667a6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -3923,7 +3923,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
final int n = policy.mAdminList.size(); final int n = policy.mAdminList.size();
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
ActiveAdmin admin = policy.mAdminList.get(i); ActiveAdmin admin = policy.mAdminList.get(i);
if (profileOwner.equals(admin.info)) { if (profileOwner.equals(admin.info.getComponent())) {
return admin; return admin;
} }
} }