diff options
author | Nicolas Prevot <nprevot@google.com> | 2014-04-29 10:35:26 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-29 10:35:26 +0000 |
commit | 627aad9c200cb19aa505504dcd232a3710e96a25 (patch) | |
tree | 95d800ab04c4b3582bf09a7055da8f210135c9eb /services | |
parent | 19db0f036aa889ff05220b630262461e333faa85 (diff) | |
parent | f2a5bf88cd3cf8690e940e1e49b63e4bb1711781 (diff) | |
download | frameworks_base-627aad9c200cb19aa505504dcd232a3710e96a25.zip frameworks_base-627aad9c200cb19aa505504dcd232a3710e96a25.tar.gz frameworks_base-627aad9c200cb19aa505504dcd232a3710e96a25.tar.bz2 |
Merge "Small fix in DeviceOwner.java."
Diffstat (limited to 'services')
-rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java index 629dea2..3c46e40 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java @@ -208,7 +208,7 @@ public class DeviceOwner { int userId = Integer.parseInt(parser.getAttributeValue(null, ATTR_USERID)); mProfileOwners.put(userId, new OwnerInfo( - profileOwnerPackageName, profileOwnerName, profileEnabled)); + profileOwnerName, profileOwnerPackageName, profileEnabled)); } else { throw new XmlPullParserException( "Unexpected tag in device owner file: " + tag); @@ -304,4 +304,4 @@ public class DeviceOwner { this.packageName = packageName; } } -}
\ No newline at end of file +} |