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

Commit 2703a13f authored by Kenny Guy's avatar Kenny Guy
Browse files

Revert "Deprecate APIs for admin to create users." 

This reverts commit ea864c4d.

Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
parent ea864c4d

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5713,8 +5713,8 @@ package android.app.admin { 
    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);

    method public deprecated 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 createUser(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 android.os.UserHandle createUser(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 java.lang.String[] getAccountTypesWithManagementDisabled();

api/system-current.txt

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

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

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

    method public deprecated 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 createUser(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 android.os.UserHandle createUser(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 java.lang.String[] getAccountTypesWithManagementDisabled();

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

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

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

     *         user could not be created.

     *

     * @deprecated

     */

    @Deprecated

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

        try {

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

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

     *         user could not be created.

     *

     * @deprecated

     */

    @Deprecated

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

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

        try {