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

Commit 3165743c authored by Tony Mak's avatar Tony Mak
Browse files

setAffiliationIds and getAffiliationIds uses set instead of list 

Didn't use @remove because java doesn't support two methods differs from
the return type only.

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testLockTask_unaffiliatedUser
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Test: cts-tradefed run cts-dev --module DevicePolicyManager  --test com.android.cts.devicepolicy.DeviceOwnerPlusProfileOwnerTest

Change-Id: Ic7c7221ef5e680a6765f028c2ab73d4c2f908c58
Fix: 37622682
parent 9226516c

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6287,7 +6287,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);
@@ -6373,7 +6373,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
@@ -18,6 +18,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
@@ -6498,7 +6498,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);
@@ -6602,7 +6602,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
@@ -16,6 +16,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
@@ -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);
@@ -6400,7 +6400,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);