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

Commit d66559f2 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Hide device initializer methods/fields." into mnc-dev

parents c54bcade 94e7bf6e

api/current.txt

+0 −11
Original line number Diff line number Diff line
@@ -5697,7 +5697,6 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";

    field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED";

    field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE";

    field public static final java.lang.String ACTION_READY_FOR_USER_INITIALIZATION = "android.app.action.READY_FOR_USER_INITIALIZATION";

    field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";

    field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";

    field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
@@ -5709,7 +5708,6 @@ package android.app.admin { 
    method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);

    method public void addUserRestriction(android.content.ComponentName, java.lang.String);

    method public void clearCrossProfileIntentFilters(android.content.ComponentName);

    method public void clearDeviceInitializerApp(android.content.ComponentName);

    method public void clearDeviceOwnerApp(java.lang.String);

    method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);

    method public void clearUserRestriction(android.content.ComponentName, java.lang.String);
@@ -5759,7 +5757,6 @@ package android.app.admin { 
    method public boolean isActivePasswordSufficient();

    method public boolean isAdminActive(android.content.ComponentName);

    method public boolean isApplicationHidden(android.content.ComponentName, java.lang.String);

    method public boolean isDeviceInitializerApp(java.lang.String);

    method public boolean isDeviceOwnerApp(java.lang.String);

    method public boolean isLockTaskPermitted(java.lang.String);

    method public boolean isMasterVolumeMuted(android.content.ComponentName);
@@ -5778,7 +5775,6 @@ package android.app.admin { 
    method public void setCameraDisabled(android.content.ComponentName, boolean);

    method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;

    method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);

    method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);

    method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);
@@ -5811,7 +5807,6 @@ package android.app.admin { 
    method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy);

    method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);

    method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);

    method public boolean setUserEnabled(android.content.ComponentName);

    method public void setUserIcon(android.content.ComponentName, android.graphics.Bitmap);

    method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);

    method public void uninstallAllUserCaCerts(android.content.ComponentName);
@@ -5840,12 +5835,6 @@ package android.app.admin { 
    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 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_DEVICE_INITIALIZER_COMPONENT_NAME = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_MINIMUM_VERSION_CODE = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_MINIMUM_VERSION_CODE";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_CHECKSUM";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_COOKIE_HEADER = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_COOKIE_HEADER";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_SIGNATURE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_SIGNATURE_CHECKSUM";

    field public static final java.lang.String EXTRA_PROVISIONING_EMAIL_ADDRESS = "android.app.extra.PROVISIONING_EMAIL_ADDRESS";

    field public static final java.lang.String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";

api/system-current.txt

+0 −11
Original line number Diff line number Diff line
@@ -5803,7 +5803,6 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";

    field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED";

    field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE";

    field public static final java.lang.String ACTION_READY_FOR_USER_INITIALIZATION = "android.app.action.READY_FOR_USER_INITIALIZATION";

    field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";

    field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";

    field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
@@ -5815,7 +5814,6 @@ package android.app.admin { 
    method public void addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName);

    method public void addUserRestriction(android.content.ComponentName, java.lang.String);

    method public void clearCrossProfileIntentFilters(android.content.ComponentName);

    method public void clearDeviceInitializerApp(android.content.ComponentName);

    method public void clearDeviceOwnerApp(java.lang.String);

    method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);

    method public void clearProfileOwner(android.content.ComponentName);
@@ -5873,7 +5871,6 @@ package android.app.admin { 
    method public boolean isActivePasswordSufficient();

    method public boolean isAdminActive(android.content.ComponentName);

    method public boolean isApplicationHidden(android.content.ComponentName, java.lang.String);

    method public boolean isDeviceInitializerApp(java.lang.String);

    method public boolean isDeviceOwnerApp(java.lang.String);

    method public boolean isLockTaskPermitted(java.lang.String);

    method public boolean isMasterVolumeMuted(android.content.ComponentName);
@@ -5894,7 +5891,6 @@ package android.app.admin { 
    method public void setCameraDisabled(android.content.ComponentName, boolean);

    method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException;

    method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);

    method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public boolean setKeyguardDisabled(android.content.ComponentName, boolean);

    method public void setKeyguardDisabledFeatures(android.content.ComponentName, int);
@@ -5927,7 +5923,6 @@ package android.app.admin { 
    method public void setSystemUpdatePolicy(android.content.ComponentName, android.app.admin.SystemUpdatePolicy);

    method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);

    method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);

    method public boolean setUserEnabled(android.content.ComponentName);

    method public void setUserIcon(android.content.ComponentName, android.graphics.Bitmap);

    method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);

    method public void uninstallAllUserCaCerts(android.content.ComponentName);
@@ -5958,12 +5953,6 @@ package android.app.admin { 
    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 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_DEVICE_INITIALIZER_COMPONENT_NAME = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_MINIMUM_VERSION_CODE = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_MINIMUM_VERSION_CODE";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_CHECKSUM";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_COOKIE_HEADER = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_COOKIE_HEADER";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_INITIALIZER_SIGNATURE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_SIGNATURE_CHECKSUM";

    field public static final java.lang.String EXTRA_PROVISIONING_EMAIL_ADDRESS = "android.app.extra.PROVISIONING_EMAIL_ADDRESS";

    field public static final java.lang.String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";

core/java/android/app/admin/DeviceAdminReceiver.java

+14 −13
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app.admin; 
import android.accounts.AccountManager;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.app.Service;

import android.content.BroadcastReceiver;

import android.content.ComponentName;
@@ -227,14 +228,15 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
            "android.app.action.PROFILE_PROVISIONING_COMPLETE";



    /**

     * @hide

     * Broadcast Action: This broadcast is sent to indicate that the system is ready for the device

     * initializer to perform user setup tasks. This is only applicable to devices managed by a

     * device owner app.

     *

     * <p>The broadcast will be limited to the {@link DeviceAdminReceiver} component specified in

     * the {@link DevicePolicyManager#EXTRA_PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME} field

     * of the original intent or NFC bump that started the provisioning process. You will generally

     * handle this in {@link DeviceAdminReceiver#onReadyForUserInitialization}.

     * the device initializer field of the original intent or NFC bump that started the provisioning

     * process. You will generally handle this in

     * {@link DeviceAdminReceiver#onReadyForUserInitialization}.

     *

     * <p>Input: Nothing.</p>

     * <p>Output: Nothing</p>
@@ -435,23 +437,22 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
     * Called during provisioning of a managed device to allow the device initializer to perform

     * user setup steps. Only device initializers should override this method.

     *

     * <p> Called when the DeviceAdminReceiver receives a

     * {@link #ACTION_READY_FOR_USER_INITIALIZATION} broadcast. As a prerequisite for the execution

     * of this callback the {@link DeviceAdminReceiver} has

     * to declare an intent filter for {@link #ACTION_READY_FOR_USER_INITIALIZATION}. Only the

     * component specified in the

     * {@link DevicePolicyManager#EXTRA_PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME} field of the

     * <p> Called when the DeviceAdminReceiver receives an

     * android.app.action.ACTION_READY_FOR_USER_INITIALIZATION broadcast. As a prerequisite for the

     * execution of this callback the {@link DeviceAdminReceiver} has

     * to declare an intent filter for android.app.action.ACTION_READY_FOR_USER_INITIALIZATION. Only

     * the component specified in the device initializer component name field of the

     * original intent or NFC bump that started the provisioning process will receive this callback.

     *

     * <p>It is not assumed that the device initializer is finished when it returns from

     * this call, as it may do additional setup asynchronously. The device initializer must call

     * {@link DevicePolicyManager#setUserEnabled(ComponentName admin)} when it has finished any

     * additional setup (such as adding an account by using the {@link AccountManager}) in order for

     * the user to be functional.

     * this call, as it may do additional setup asynchronously. The device initializer must enable

     * the current user when it has finished any additional setup (such as adding an account by

     * using the {@link AccountManager}) in order for the user to be functional.

     *

     * @param context The running context as per {@link #onReceive}.

     * @param intent The received intent as per {@link #onReceive}.

     */

    @SystemApi

    public void onReadyForUserInitialization(Context context, Intent intent) {

    }

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

+10 −5
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ public class DevicePolicyManager { 
             "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";



    /**

     * @hide

     * On devices managed by a device owner app, a {@link ComponentName} extra indicating the

     * component of the application that is temporarily granted device owner privileges during

     * device initialization and profile owner privileges during secondary user initialization.
@@ -483,6 +484,7 @@ public class DevicePolicyManager { 
        = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_COMPONENT_NAME";



    /**

     * @hide

     * A String extra holding an http url that specifies the download location of the device

     * initializer package. When not provided it is assumed that the device initializer package is

     * already installed.
@@ -494,6 +496,7 @@ public class DevicePolicyManager { 
        = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION";



    /**

     * @hide

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

     * If the initializer is already installed on the device, it will only be re-downloaded from

     * {@link #EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION} if the version of
@@ -506,6 +509,7 @@ public class DevicePolicyManager { 
        = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_MINIMUM_VERSION_CODE";



    /**

     * @hide

     * A String extra holding a http cookie header which should be used in the http request to the

     * url specified in {@link #EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION}.

     *
@@ -516,6 +520,7 @@ public class DevicePolicyManager { 
        = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_COOKIE_HEADER";



    /**

     * @hide

     * A String extra holding the URL-safe base64 encoded SHA-256 checksum of the file at download

     * location specified in

     * {@link #EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION}.
@@ -532,6 +537,7 @@ public class DevicePolicyManager { 
        = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_CHECKSUM";



    /**

     * @hide

     * A String extra holding the URL-safe base64 encoded SHA-256 checksum of any signature of the

     * android package archive at the download location specified in {@link

     * #EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION}.
@@ -611,11 +617,6 @@ public class DevicePolicyManager { 
     * {@link #MIME_TYPE_PROVISIONING_NFC}:

     * <ul>

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

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

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

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

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

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

     * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME}.

     * Replaces {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME}. The value of the property

     * should be converted to a String via
@@ -2756,6 +2757,7 @@ public class DevicePolicyManager { 
    }



    /**

     * @hide

     * Sets the given component as the device initializer. The package must already be installed and

     * set as an active device administrator, and there must not be an existing device initializer,

     * for this call to succeed. This method can only be called by an app holding the
@@ -2784,6 +2786,7 @@ public class DevicePolicyManager { 
    }



    /**

     * @hide

     * Used to determine if a particular package has been registered as the device initializer.

     *

     * @param packageName the package name of the app, to compare with the registered device
@@ -2802,6 +2805,7 @@ public class DevicePolicyManager { 
    }



    /**

     * @hide

     * Removes the device initializer, so that it will not be invoked on user initialization for any

     * subsequently created users. This method can be called by either the device owner or device

     * initializer itself. The caller must be an active administrator.
@@ -2856,6 +2860,7 @@ public class DevicePolicyManager { 




    /**

     * @hide

     * Sets the enabled state of the user. A user should be enabled only once it is ready to

     * be used.

     *