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

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

Merge "Prevent use of Enrollment-specific Id on parent"

parents 0eb9c292 afcd70ee

core/java/android/app/admin/DevicePolicyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -12870,6 +12870,7 @@ public class DevicePolicyManager { 
     * @throws SecurityException if the caller is not a profile owner or device owner.

     */

    @NonNull public String getEnrollmentSpecificId() {

        throwIfParentInstance("getEnrollmentSpecificId");

        if (mService == null) {

            return "";

        }
@@ -12892,6 +12893,7 @@ public class DevicePolicyManager { 
     *                     enrolled into.

     */

    public void setOrganizationId(@NonNull String enterpriseId) {

        throwIfParentInstance("setOrganizationId");

        setOrganizationIdForUser(mContext.getPackageName(), enterpriseId, myUserId());

    }