summaryrefslogtreecommitdiffstats
path: root/api/system-current.txt
diff options
context:
space:
mode:
authorKenny Guy <kennyguy@google.com>2015-06-29 12:42:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-29 12:42:21 +0000
commit01056b36622eafa657c95f9576ec2b4cacb741a4 (patch)
tree653b6c2faa6b5b7e722e9a150070ebaab8b271d9 /api/system-current.txt
parentf1fff7976937d92bc7e0014d54cb071a509975dc (diff)
parentea864c4d4d7ca390d3b67868fd2a640411bff020 (diff)
downloadframeworks_base-01056b36622eafa657c95f9576ec2b4cacb741a4.zip
frameworks_base-01056b36622eafa657c95f9576ec2b4cacb741a4.tar.gz
frameworks_base-01056b36622eafa657c95f9576ec2b4cacb741a4.tar.bz2
Merge "Deprecate APIs for admin to create users." into mnc-dev
Diffstat (limited to 'api/system-current.txt')
-rw-r--r--api/system-current.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 7e07e48..b83e7f2 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 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 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 void enableSystemApp(android.content.ComponentName, java.lang.String);
method public int enableSystemApp(android.content.ComponentName, android.content.Intent);
method public java.lang.String[] getAccountTypesWithManagementDisabled();