4 files changed, 0 insertions, 19 deletions
diff --git a/api/removed.txt b/api/removed.txt
index 9baafeb38f8e..49b72e151300 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -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>);
   }
 
 }
diff --git a/api/system-removed.txt b/api/system-removed.txt
index b1a29e71590e..48f62b13e56f 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -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>);
   }
 
 }
diff --git a/api/test-removed.txt b/api/test-removed.txt
index 9baafeb38f8e..49b72e151300 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -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>);
   }
 
 }
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index de80c36bc561..9ae5d1c86842 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -7609,22 +7609,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.
      */