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

Commit f62a8ec7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update javadoc for INHERIT_DEVICE_POLICY" into udc-dev am: c3aa9085... 

Merge "Update javadoc for INHERIT_DEVICE_POLICY" into udc-dev am: c3aa9085 am: b7684ef8 am: 0f1472b0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23468177



Change-Id: Icc271a9ca06ff6abf84b93af3f51a8cbf8db612f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c08181d 0f1472b0

core/java/android/content/pm/UserProperties.java

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ public final class UserProperties implements Parcelable { 
     * device policies from its parent profile.

     *

     *<p> All the user restrictions and device policies would be not propagated to the profile

     * with this property value. The {(TODO:b/256978256) @link DevicePolicyEngine}

     * with this property value. The {@link com.android.server.devicepolicy.DevicePolicyEngine}

     * uses this property to determine and propagate only select ones to the given profile.

     *

     * @hide