diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-06-29 13:24:24 +0000 |
|---|---|---|
| committer | Kenny Guy <kennyguy@google.com> | 2015-06-29 13:24:24 +0000 |
| commit | 2703a13f11c27c36d1354e49fb70dd663cdf397c (patch) | |
| tree | 98fdc9e1a218d884ced97a4bfa65415c805c1c3d /api | |
| parent | ea864c4d4d7ca390d3b67868fd2a640411bff020 (diff) | |
| download | frameworks_base-2703a13f11c27c36d1354e49fb70dd663cdf397c.zip frameworks_base-2703a13f11c27c36d1354e49fb70dd663cdf397c.tar.gz frameworks_base-2703a13f11c27c36d1354e49fb70dd663cdf397c.tar.bz2 | |
Revert "Deprecate APIs for admin to create users."
This reverts commit ea864c4d4d7ca390d3b67868fd2a640411bff020.
Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index e0712de..8c32371 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/api/system-current.txt b/api/system-current.txt index 13bff98..2b5c9d8 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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(); |