Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65d3fdca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b17f3799 0bc24f62

data/etc/privapp-permissions-platform.xml

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ applications that come with the platform 
        <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

+4 −2
Original line number Diff line number Diff line
@@ -969,8 +969,10 @@ class Owners { 
            if (remoteBugreportHash != null) {

                out.attribute(null, ATTR_REMOTE_BUGREPORT_HASH, remoteBugreportHash);

            }

            if (canAccessDeviceIds) {

                out.attribute(null, ATTR_CAN_ACCESS_DEVICE_IDS,

                        String.valueOf(canAccessDeviceIds));

            }

            out.endTag(null, tag);

        }