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

Commit 38cfd9c5 authored by Victor Chang's avatar Victor Chang
Browse files

Add new system api to pass parameters from Oobconfig to ManagedProvisioning 

- trying to remove the provisioning in Oobconfig
- Pass the provisioning information in ManagedProvisioning instead

Bug: 32760855
Test: update api successfully
Change-Id: Ic108856a7785574ee3f104f1156e155f2f2165b0
parent 43769ddb

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6422,6 +6422,8 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_ICON_URI = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_ICON_URI";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL";

    field public static final deprecated java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM";

    field public static final java.lang.String EXTRA_PROVISIONING_DISCLAIMERS = "android.app.extra.PROVISIONING_DISCLAIMERS";
@@ -6434,8 +6436,10 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME";

    field public static final java.lang.String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";

    field public static final java.lang.String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";

    field public static final java.lang.String EXTRA_PROVISIONING_ORGANIZATION_NAME = "android.app.extra.PROVISIONING_ORGANIZATION_NAME";

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

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

    field public static final java.lang.String EXTRA_PROVISIONING_SUPPORT_URL = "android.app.extra.PROVISIONING_SUPPORT_URL";

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

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PAC_URL = "android.app.extra.PROVISIONING_WIFI_PAC_URL";

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

+66 −1
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}, optional</li>

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

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

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

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

     * <li>{@link #EXTRA_PROVISIONING_LOCAL_TIME} (convert to String), optional</li>

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

     * <li>{@link #EXTRA_PROVISIONING_LOCALE}, optional</li>
@@ -290,6 +292,8 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_WIFI_PROXY_PORT} (convert to String), optional</li>

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

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

     * <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></ul>

     *

     * @hide
@@ -687,6 +691,67 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";



    /**

     * A String extra holding the localized name of the organization under management.

     *

     * The name is displayed only during provisioning.

     *

     * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_PROVISIONING_ORGANIZATION_NAME =

            "android.app.extra.PROVISIONING_ORGANIZATION_NAME";



    /**

     * A String extra holding a url to the website of the device's provider. The website can be

     * opened in a browser during provisioning.

     *

     * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_PROVISIONING_SUPPORT_URL =

            "android.app.extra.PROVISIONING_SUPPORT_URL";



    /**

     * A String extra holding the localized name of the device admin package. It should be the same

     * as the app label of the package.

     *

     * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL =

            "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL";



    /**

     * A {@link Uri} extra pointing to the app icon of device admin package. This image will be

     * shown during the provisioning.

     * <h5>The following URI schemes are accepted:</h5>

     * <ul>

     * <li>content ({@link android.content.ContentResolver#SCHEME_CONTENT})</li>

     * <li>android.resource ({@link android.content.ContentResolver#SCHEME_ANDROID_RESOURCE})</li>

     * </ul>

     *

     * <p> It is the responsibility of the caller to provide an image with a reasonable

     * pixel density for the device.

     *

     * <p> If a content: URI is passed, the intent should have the flag

     * {@link Intent#FLAG_GRANT_READ_URI_PERMISSION} and the uri should be added to the

     * {@link android.content.ClipData} of the intent too.

     *

     * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}

     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_ICON_URI =

            "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_ICON_URI";



    /**

     * An int extra holding a minimum required version code for the device admin package. If the

     * device admin is already installed on the device, it will only be re-downloaded from
@@ -808,7 +873,7 @@ public class DevicePolicyManager { 
     * </ul>

     *

     * <p> It is the responsibility of the caller to provide an image with a reasonable

     * pixed density for the device.

     * pixel density for the device.

     *

     * <p> If a content: URI is passed, the intent should have the flag

     * {@link Intent#FLAG_GRANT_READ_URI_PERMISSION} and the uri should be added to the