commit 627aad9c200cb19aa505504dcd232a3710e96a25
author Nicolas Prevot <nprevot@google.com> Tue Apr 29 10:35:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 29 10:35:26 2014 +0000
tree 95d800ab04c4b3582bf09a7055da8f210135c9eb
parent 19db0f036aa889ff05220b630262461e333faa85
parent f2a5bf88cd3cf8690e940e1e49b63e4bb1711781

Merge "Small fix in DeviceOwner.java."

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

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 @@
                     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 @@
             this.packageName = packageName;
         }
     }
-}
\ No newline at end of file
+}