commit 65d3fdcacba0fd45cd6b7c3458e503688ab2ed14
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 21 16:33:32 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 21 16:33:32 2018 +0000
tree dfb0bc5070217f30a9aec1c4d00d69b7ede176a7
parent b17f37996a0c68859c0d93085eb5814bfe0547a7
parent 0bc24f6283688b3845ae544a7f410a73aed7f385

Merge "Device ID attestation for Corp-owned Profile Owner: follow-up"

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 163b6b3..9e4ea32 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -91,7 +91,6 @@
         <permission name="android.permission.CONNECTIVITY_INTERNAL"/>
         <permission name="android.permission.CRYPT_KEEPER"/>
         <permission name="android.permission.DELETE_PACKAGES"/>
-        <permission name="android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS"/>
         <permission name="android.permission.INSTALL_PACKAGES"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
         <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>

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

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
index a2bec79..ee1c1df3 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
@@ -969,8 +969,10 @@
             if (remoteBugreportHash != null) {
                 out.attribute(null, ATTR_REMOTE_BUGREPORT_HASH, remoteBugreportHash);
             }
-            out.attribute(null, ATTR_CAN_ACCESS_DEVICE_IDS,
-                    String.valueOf(canAccessDeviceIds));
+            if (canAccessDeviceIds) {
+                out.attribute(null, ATTR_CAN_ACCESS_DEVICE_IDS,
+                        String.valueOf(canAccessDeviceIds));
+            }
             out.endTag(null, tag);
         }