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

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

Merge "Update description for skip ownership screen extra" into sc-dev am: c11d161d 

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

Change-Id: Idf578041ad0e06f98f826d50cc1fc6dee9c3ee14
parents d62b7394 c11d161d

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

+2 −2
Original line number Diff line number Diff line
@@ -2678,8 +2678,8 @@ public class DevicePolicyManager { 
     * A boolean extra which determines whether to skip the ownership disclaimer screen during the

     * provisioning flow. The default value is {@code false}.

     *

     * If the value is {@code true}, it is the responsibility of the provisioning initiator to

     * show the relevant disclaimer.

     * If the value is {@code true}, the provisioning initiator must display a device ownership

     * disclaimer screen similar to that provided in AOSP.

     *

     * <p>This extra is only respected when provided alongside the {@link

     * #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE} intent action.