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

Commit d49dfb7c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5444388 from 986f1f4e to qt-release 

Change-Id: Iba28d28ecbead2bace63e17a59efd5325a3b3d77
parents 356cd04f 986f1f4e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6870,6 +6870,7 @@ package android.app.admin { 
    field public static final String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";

    field public static final String EXTRA_PROVISIONING_MODE = "android.app.extra.PROVISIONING_MODE";

    field public static final String EXTRA_PROVISIONING_SERIAL_NUMBER = "android.app.extra.PROVISIONING_SERIAL_NUMBER";

    field public static final String EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS = "android.app.extra.PROVISIONING_SKIP_EDUCATION_SCREENS";

    field public static final String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";

    field public static final String EXTRA_PROVISIONING_SKIP_USER_CONSENT = "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";

    field public static final String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";

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

+45 −1
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_DISCLAIMERS}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}, optional</li>

     * </ul>

     *

     * <p>When device owner provisioning has completed, an intent of the type
@@ -323,6 +324,33 @@ public class DevicePolicyManager { 
     * the device. A device owner has full control over the device. The device owner can not be

     * modified by the user and the only way of resetting the device is via factory reset.

     *

     * <p>From version {@link android.os.Build.VERSION_CODES#Q}, the admin app can choose

     * whether to set up a fully managed device or a work profile. For the admin app to support

     * this, it must have an activity with intent filter {@link #ACTION_GET_PROVISIONING_MODE} and

     * another one with intent filter {@link #ACTION_ADMIN_POLICY_COMPLIANCE}. For example:

     * <pre>

     * &lt;activity

     *     android:name=".GetProvisioningModeActivity"

     *     android:label="@string/app_name"

     *     android:permission="android.permission.BIND_DEVICE_ADMIN"&gt;

     *     &lt;intent-filter&gt;

     *         &lt;action

     *             android:name="android.app.action.GET_PROVISIONING_MODE" /&gt;

     *         &lt;category android:name="android.intent.category.DEFAULT" /&gt;

     *     &lt;/intent-filter&gt;

     * &lt;/activity&gt;

     *

     * &lt;activity

     *     android:name=".PolicyComplianceActivity"

     *     android:label="@string/app_name"

     *     android:permission="android.permission.BIND_DEVICE_ADMIN"&gt;

     *     &lt;intent-filter&gt;

     *         &lt;action

     *             android:name="android.app.action.ADMIN_POLICY_COMPLIANCE" /&gt;

     *         &lt;category android:name="android.intent.category.DEFAULT" /&gt;

     *     &lt;/intent-filter&gt;

     * &lt;/activity&gt;</pre>

     *

     * <p>A typical use case would be a device that is owned by a company, but used by either an

     * employee or client.

     *
@@ -354,7 +382,9 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_SUPPORT_URL}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_ORGANIZATION_NAME}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_USE_MOBILE_DATA, optional </li><ul>

     * <li>{@link #EXTRA_PROVISIONING_USE_MOBILE_DATA}, optional </li>

     * <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}, optional</li>

     * </ul>

     *

     * @hide

     */
@@ -393,6 +423,7 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS}, optional</li>

     * </ul>

     *

     * <p>When device owner provisioning has completed, an intent of the type
@@ -1114,6 +1145,19 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_SKIP_USER_CONSENT =

            "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";



    /**

     * A boolean extra indicating if the education screens from the provisioning flow should be

     * skipped. If unspecified, defaults to {@code false}.

     *

     * <p>If the education screens are skipped, it is the admin application's responsibility

     * to display its own user education screens.

     *

     * <p>It can be used when provisioning a fully managed device via

     * {@link #ACTION_PROVISION_MANAGED_DEVICE}.

     */

    public static final String EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS =

            "android.app.extra.PROVISIONING_SKIP_EDUCATION_SCREENS";



    /**

     * A boolean extra indicating if mobile data should be used during NFC device owner provisioning

     * for downloading the mobile device management application. If {@link

core/res/res/values-af/strings.xml

+63 −126

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values-am/strings.xml

+63 −126

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values-ar/strings.xml

+63 −126

File changed.

Preview size limit exceeded, changes collapsed.