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

Commit 8d902a9e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents dfd185c6 8c6969b6

api/removed.txt

+0 −1
Original line number Diff line number Diff line
@@ -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>);

  }



}

api/system-removed.txt

+0 −1
Original line number Diff line number Diff line
@@ -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>);

  }



}

api/test-removed.txt

+0 −1
Original line number Diff line number Diff line
@@ -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>);

  }



}

core/java/android/app/admin/DevicePolicyManager.java

+0 −16
Original line number Diff line number Diff line
@@ -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.