diff --git a/api/current.txt b/api/current.txt
index 6140d51b22292..2a40cf0bd2232 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -36973,6 +36973,7 @@ package android.service.autofill {
 
   public abstract class AutofillService extends android.app.Service {
     ctor public AutofillService();
+    method public final deprecated void disableSelf();
     method public final android.os.IBinder onBind(android.content.Intent);
     method public void onConnected();
     method public void onDisconnected();
diff --git a/api/system-current.txt b/api/system-current.txt
index 1e52b21a2afaa..e70b282a9cf82 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -40069,6 +40069,7 @@ package android.service.autofill {
 
   public abstract class AutofillService extends android.app.Service {
     ctor public AutofillService();
+    method public final deprecated void disableSelf();
     method public final android.os.IBinder onBind(android.content.Intent);
     method public void onConnected();
     method public void onDisconnected();
diff --git a/api/test-current.txt b/api/test-current.txt
index f6a7509bc820f..3b41de1334248 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -37132,6 +37132,7 @@ package android.service.autofill {
 
   public abstract class AutofillService extends android.app.Service {
     ctor public AutofillService();
+    method public final deprecated void disableSelf();
     method public final android.os.IBinder onBind(android.content.Intent);
     method public void onConnected();
     method public void onDisconnected();
diff --git a/core/java/android/service/autofill/AutofillService.java b/core/java/android/service/autofill/AutofillService.java
index d86dd5b42bb9d..a4d3fb2997343 100644
--- a/core/java/android/service/autofill/AutofillService.java
+++ b/core/java/android/service/autofill/AutofillService.java
@@ -242,7 +242,7 @@ public abstract class AutofillService extends Service {
     public void onDisconnected() {
     }
 
-    /** @hide */
+    @Deprecated
     public final void disableSelf() {
         // TODO(b/33197203): Remove when GCore has migrated off this API
         getSystemService(AutofillManager.class).disableOwnedAutofillServices();