am 545d0fa0: Merge "Small fix in DeviceOwner.java."

* commit '545d0fa0d225d8b95b4f1d69a7fa8b2080543dad':
  Small fix in DeviceOwner.java.
This commit is contained in:
Nicolas Prevot
2014-04-29 10:39:20 +00:00
committed by Android Git Automerger

View File

@@ -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;
}
}
}
}