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

Merge "Remove the old version of setAffiliationIds" into oc-dev

Browse Source 
am: 8d902a9e28

Change-Id: I219958d5f9d74845b0ec03f88903ea6b9ec345c6
This commit is contained in:
Tony Mak
2017-05-26 13:06:23 +00:00
committed by android-build-merger
parent aa75fc4ec9 8d902a9e28
commit 754f6e22b0
4 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/removed.txt
View File

@@ -72,7 +72,6 @@ package android.app.admin {
method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
method public deprecated java.lang.String getDeviceInitializerApp();
method public deprecated android.content.ComponentName getDeviceInitializerComponent();
method public void setAffiliationIds(android.content.ComponentName, java.util.List<java.lang.String>);
}
}

1
api/system-removed.txt
View File

@@ -70,7 +70,6 @@ package android.app.admin {
public class DevicePolicyManager {
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 setAffiliationIds(android.content.ComponentName, java.util.List<java.lang.String>);
}
}

1
api/test-removed.txt
View File

@@ -72,7 +72,6 @@ package android.app.admin {
method public deprecated android.os.UserHandle createUser(android.content.ComponentName, java.lang.String);
method public deprecated java.lang.String getDeviceInitializerApp();
method public deprecated android.content.ComponentName getDeviceInitializerComponent();
method public void setAffiliationIds(android.content.ComponentName, java.util.List<java.lang.String>);
}
}

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

@@ -7608,22 +7608,6 @@ public class DevicePolicyManager {
}
}
/**
* STOPSHIP (b/37622682) Remove it before release.
* @removed
*/
public void setAffiliationIds(@NonNull ComponentName admin, @NonNull List<String> ids) {
throwIfParentInstance("setAffiliationIds");
if (ids == null) {
throw new IllegalArgumentException("ids must not be null");
}
try {
mService.setAffiliationIds(admin, ids);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
/**
* Returns the set of affiliation ids previously set via {@link #setAffiliationIds}, or an
* empty set if none have been set.