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

Commit 31659c25 authored by Kenny Guy's avatar Kenny Guy Committed by Android (Google) Code Review
Browse files

Merge "Deprecate APIs for admin to create users." into mnc-dev

parents 2b61c6b1 14f48e5a

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -5615,8 +5615,8 @@ package android.app.admin { 
    method public void clearDeviceOwnerApp(java.lang.String);

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

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

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

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

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

    method public android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);

    method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);

    method public android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);

    method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);

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

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

    method public int enableSystemApp(android.content.ComponentName, android.content.Intent);

    method public int enableSystemApp(android.content.ComponentName, android.content.Intent);

    method public java.lang.String[] getAccountTypesWithManagementDisabled();

    method public java.lang.String[] getAccountTypesWithManagementDisabled();

api/system-current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -5736,8 +5736,8 @@ package android.app.admin { 
    method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);

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

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

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

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

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

    method public android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);

    method public deprecated android.os.UserHandle createAndInitializeUser(android.content.ComponentName, java.lang.String, java.lang.String, android.content.ComponentName, android.os.Bundle);

    method public android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);

    method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);

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

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

    method public int enableSystemApp(android.content.ComponentName, android.content.Intent);

    method public int enableSystemApp(android.content.ComponentName, android.content.Intent);

    method public java.lang.String[] getAccountTypesWithManagementDisabled();

    method public java.lang.String[] getAccountTypesWithManagementDisabled();

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -3612,7 +3612,10 @@ public class DevicePolicyManager { 
     * @see UserHandle

     * @see UserHandle

     * @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the

     * @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the

     *         user could not be created.

     *         user could not be created.

     *

     * @deprecated From {@link android.os.Build.VERSION_CODES#MNC}

     */

     */

    @Deprecated

    public UserHandle createUser(@NonNull ComponentName admin, String name) {

    public UserHandle createUser(@NonNull ComponentName admin, String name) {

        try {

        try {

            return mService.createUser(admin, name);

            return mService.createUser(admin, name);
@@ -3646,7 +3649,10 @@ public class DevicePolicyManager { 
     * @see UserHandle

     * @see UserHandle

     * @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the

     * @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the

     *         user could not be created.

     *         user could not be created.

     *

     * @deprecated From {@link android.os.Build.VERSION_CODES#MNC}

     */

     */

    @Deprecated

    public UserHandle createAndInitializeUser(@NonNull ComponentName admin, String name,

    public UserHandle createAndInitializeUser(@NonNull ComponentName admin, String name,

            String ownerName, @NonNull ComponentName profileOwnerComponent, Bundle adminExtras) {

            String ownerName, @NonNull ComponentName profileOwnerComponent, Bundle adminExtras) {

        try {

        try {