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

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

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

parents bee7245c 2703a13f

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5615,8 +5615,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
@@ -5736,8 +5736,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
@@ -3612,10 +3612,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);
@@ -3649,10 +3646,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 {