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

Commit 41284993 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge "Remove the old version of setAffiliationIds" into oc-dev am: 8d902a9e 

am: 754f6e22

Change-Id: I95a4b13ed76b6ce38c50047c9c6c923bf2ef7778
parents 0e274792 754f6e22

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
@@ -7628,22 +7628,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.