diff options
| author | Kenny Guy <kennyguy@google.com> | 2015-06-29 13:28:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 13:28:54 +0000 |
| commit | 43904fd5b7ea74f21859ec94291a70529611304c (patch) | |
| tree | b99506dac79ffcc2ab94c209749c2d5592d2a655 /api | |
| parent | bee7245c69cd3d3c1404f35299c3867d1b8525f5 (diff) | |
| parent | 2703a13f11c27c36d1354e49fb70dd663cdf397c (diff) | |
| download | frameworks_base-43904fd5b7ea74f21859ec94291a70529611304c.zip frameworks_base-43904fd5b7ea74f21859ec94291a70529611304c.tar.gz frameworks_base-43904fd5b7ea74f21859ec94291a70529611304c.tar.bz2 | |
Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev
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 8d6b3b3..1f10695 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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(); diff --git a/api/system-current.txt b/api/system-current.txt index 9784dcb..4592370 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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(); |