Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev

Browse Source 
* commit 'd0418e8cf9a250183a2fc3d7474f82dc9e2da734':
  Deprecate APIs for admin to create users.
This commit is contained in:
Kenny Guy
2015-06-30 13:25:21 +00:00
committed by Android Git Automerger
parent 2d72041d47 d0418e8cf9
commit 2b3eccaec6
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -5615,8 +5615,8 @@ package android.app.admin {
method public void clearDeviceOwnerApp(java.lang.String); method public void clearDeviceOwnerApp(java.lang.String);
method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, 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 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 deprecated 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 createUser(android.content.ComponentName, java.lang.String);
method public void enableSystemApp(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 int enableSystemApp(android.content.ComponentName, android.content.Intent);
method public java.lang.String[] getAccountTypesWithManagementDisabled(); method public java.lang.String[] getAccountTypesWithManagementDisabled();

4
api/system-current.txt
View File

@@ -5736,8 +5736,8 @@ package android.app.admin {
method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String); method public void clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String);
method public void clearProfileOwner(android.content.ComponentName); method public void clearProfileOwner(android.content.ComponentName);
method public void clearUserRestriction(android.content.ComponentName, java.lang.String); 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 deprecated 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 createUser(android.content.ComponentName, java.lang.String);
method public void enableSystemApp(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 int enableSystemApp(android.content.ComponentName, android.content.Intent);
method public java.lang.String[] getAccountTypesWithManagementDisabled(); method public java.lang.String[] getAccountTypesWithManagementDisabled();

6
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -3612,7 +3612,10 @@ public class DevicePolicyManager {
* @see UserHandle * @see UserHandle
* @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the * @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the
* user could not be created. * user could not be created.
*
* @deprecated From {@link android.os.Build.VERSION_CODES#MNC}
*/ */
@Deprecated
public UserHandle createUser(@NonNull ComponentName admin, String name) { public UserHandle createUser(@NonNull ComponentName admin, String name) {
try { try {
return mService.createUser(admin, name); return mService.createUser(admin, name);
@@ -3646,7 +3649,10 @@ public class DevicePolicyManager {
* @see UserHandle * @see UserHandle
* @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the * @return the {@link android.os.UserHandle} object for the created user, or {@code null} if the
* user could not be created. * user could not be created.
*
* @deprecated From {@link android.os.Build.VERSION_CODES#MNC}
*/ */
@Deprecated
public UserHandle createAndInitializeUser(@NonNull ComponentName admin, String name, public UserHandle createAndInitializeUser(@NonNull ComponentName admin, String name,
String ownerName, @NonNull ComponentName profileOwnerComponent, Bundle adminExtras) { String ownerName, @NonNull ComponentName profileOwnerComponent, Bundle adminExtras) {
try { try {