Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 424dd39e authored Apr 27, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Apr 27, 2017

Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev

parents f4362fda 3165743c

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -6307,7 +6307,7 @@ package android.app.admin {
		method public int enableSystemApp(android.content.ComponentName, android.content.Intent);
		method public java.lang.String[] getAccountTypesWithManagementDisabled();
		method public java.util.List<android.content.ComponentName> getActiveAdmins();
		method public java.util.List<java.lang.String> getAffiliationIds(android.content.ComponentName);
		method public java.util.Set<java.lang.String> getAffiliationIds(android.content.ComponentName);
		method public java.lang.String getAlwaysOnVpnPackage(android.content.ComponentName);
		method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);
		method public deprecated java.lang.String getApplicationRestrictionsManagingPackage(android.content.ComponentName);
		@@ -6393,7 +6393,7 @@ package android.app.admin {
		method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrievePreRebootSecurityLogs(android.content.ComponentName);
		method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrieveSecurityLogs(android.content.ComponentName);
		method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean);
		method public void setAffiliationIds(android.content.ComponentName, java.util.List<java.lang.String>);
		method public void setAffiliationIds(android.content.ComponentName, java.util.Set<java.lang.String>);
		method public void setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String, boolean) throws android.content.pm.PackageManager.NameNotFoundException, java.lang.UnsupportedOperationException;
		method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
		method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle);

api/removed.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ 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>);
		}

		}

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -6521,7 +6521,7 @@ package android.app.admin {
		method public int enableSystemApp(android.content.ComponentName, android.content.Intent);
		method public java.lang.String[] getAccountTypesWithManagementDisabled();
		method public java.util.List<android.content.ComponentName> getActiveAdmins();
		method public java.util.List<java.lang.String> getAffiliationIds(android.content.ComponentName);
		method public java.util.Set<java.lang.String> getAffiliationIds(android.content.ComponentName);
		method public java.lang.String getAlwaysOnVpnPackage(android.content.ComponentName);
		method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);
		method public deprecated java.lang.String getApplicationRestrictionsManagingPackage(android.content.ComponentName);
		@@ -6625,7 +6625,7 @@ package android.app.admin {
		method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrieveSecurityLogs(android.content.ComponentName);
		method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean);
		method public deprecated boolean setActiveProfileOwner(android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException;
		method public void setAffiliationIds(android.content.ComponentName, java.util.List<java.lang.String>);
		method public void setAffiliationIds(android.content.ComponentName, java.util.Set<java.lang.String>);
		method public void setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String, boolean) throws android.content.pm.PackageManager.NameNotFoundException, java.lang.UnsupportedOperationException;
		method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
		method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle);

api/system-removed.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ 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>);
		}

		}

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -6327,7 +6327,7 @@ package android.app.admin {
		method public int enableSystemApp(android.content.ComponentName, android.content.Intent);
		method public java.lang.String[] getAccountTypesWithManagementDisabled();
		method public java.util.List<android.content.ComponentName> getActiveAdmins();
		method public java.util.List<java.lang.String> getAffiliationIds(android.content.ComponentName);
		method public java.util.Set<java.lang.String> getAffiliationIds(android.content.ComponentName);
		method public java.lang.String getAlwaysOnVpnPackage(android.content.ComponentName);
		method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);
		method public deprecated java.lang.String getApplicationRestrictionsManagingPackage(android.content.ComponentName);
		@@ -6420,7 +6420,7 @@ package android.app.admin {
		method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrievePreRebootSecurityLogs(android.content.ComponentName);
		method public java.util.List<android.app.admin.SecurityLog.SecurityEvent> retrieveSecurityLogs(android.content.ComponentName);
		method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean);
		method public void setAffiliationIds(android.content.ComponentName, java.util.List<java.lang.String>);
		method public void setAffiliationIds(android.content.ComponentName, java.util.Set<java.lang.String>);
		method public void setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String, boolean) throws android.content.pm.PackageManager.NameNotFoundException, java.lang.UnsupportedOperationException;
		method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
		method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle);