Merge "Write device owner name to XML" into lmp-dev

2014-08-21 20:28:07 +00:00
parent 7d37344915 4e7a65f15c
commit de3af82ce0
1 changed files with 3 additions and 0 deletions
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java
@@ -267,6 +267,9 @@ public class DeviceOwner {
            if (mDeviceOwner != null) {
                out.startTag(null, TAG_DEVICE_OWNER);
                out.attribute(null, ATTR_PACKAGE, mDeviceOwner.packageName);
+                if (mDeviceOwner.name != null) {
+                    out.attribute(null, ATTR_NAME, mDeviceOwner.name);
+                }
                out.endTag(null, TAG_DEVICE_OWNER);
            }