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

Commit 9c96367e 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 

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



Change-Id: I54f5a4e1ed1f795de1302e15da74190827295266
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4a35f2a c3aa9085

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