commit de3af82ce0c533a284df8d5afc49a475b003ea46
author Jason Monk <jmonk@google.com> Thu Aug 21 20:28:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 21 20:28:10 2014 +0000
tree 3e2e879ad6c9633d67ee6c67fdd892a5abb66391
parent 7d3734491516fdda47059f2a36c1de9fa39dd8a9
parent 4e7a65f15c80c2601fdb24e596f4a9af4926546a

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

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 4b60c9f..5938819 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceOwner.java
@@ -267,6 +267,9 @@
             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);
             }