Merge "Removed deprecated onFillRequest() method" into oc-dev
diff --git a/api/current.txt b/api/current.txt
index f9a846d..17fe1ae 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -37021,7 +37021,7 @@
method public final android.os.IBinder onBind(android.content.Intent);
method public void onConnected();
method public void onDisconnected();
- method public void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, int, android.os.CancellationSignal, android.service.autofill.FillCallback);
+ method public abstract void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, int, android.os.CancellationSignal, android.service.autofill.FillCallback);
method public abstract void onSaveRequest(android.app.assist.AssistStructure, android.os.Bundle, android.service.autofill.SaveCallback);
field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillService";
field public static final java.lang.String SERVICE_META_DATA = "android.autofill";
diff --git a/api/system-current.txt b/api/system-current.txt
index c8eb9a0..8a9d8aa 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -40092,7 +40092,7 @@
method public final android.os.IBinder onBind(android.content.Intent);
method public void onConnected();
method public void onDisconnected();
- method public void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, int, android.os.CancellationSignal, android.service.autofill.FillCallback);
+ method public abstract void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, int, android.os.CancellationSignal, android.service.autofill.FillCallback);
method public abstract void onSaveRequest(android.app.assist.AssistStructure, android.os.Bundle, android.service.autofill.SaveCallback);
field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillService";
field public static final java.lang.String SERVICE_META_DATA = "android.autofill";
diff --git a/api/test-current.txt b/api/test-current.txt
index f65412f..5f718b9 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -37179,7 +37179,7 @@
method public final android.os.IBinder onBind(android.content.Intent);
method public void onConnected();
method public void onDisconnected();
- method public void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, int, android.os.CancellationSignal, android.service.autofill.FillCallback);
+ method public abstract void onFillRequest(android.app.assist.AssistStructure, android.os.Bundle, int, android.os.CancellationSignal, android.service.autofill.FillCallback);
method public abstract void onSaveRequest(android.app.assist.AssistStructure, android.os.Bundle, android.service.autofill.SaveCallback);
field public static final java.lang.String SERVICE_INTERFACE = "android.service.autofill.AutofillService";
field public static final java.lang.String SERVICE_META_DATA = "android.autofill";
diff --git a/core/java/android/service/autofill/AutofillService.java b/core/java/android/service/autofill/AutofillService.java
index ef14095..aae22c1 100644
--- a/core/java/android/service/autofill/AutofillService.java
+++ b/core/java/android/service/autofill/AutofillService.java
@@ -216,24 +216,9 @@
* handling this fill request in order to save resources.
* @param callback object used to notify the result of the request.
*/
- public void onFillRequest(@NonNull AssistStructure structure, @Nullable Bundle data, int flags,
- @NonNull CancellationSignal cancellationSignal, @NonNull FillCallback callback) {
- //TODO(b/33197203): make non-abstract once older method is removed
- onFillRequest(structure, data, cancellationSignal, callback);
- }
-
- /**
- * @hide
- * @deprecated - use {@link #onFillRequest(AssistStructure, Bundle, int,
- * CancellationSignal, FillCallback)} instead
- */
- //TODO(b/33197203): remove once clients are not using anymore
- @Deprecated
- public void onFillRequest(@NonNull AssistStructure structure, @Nullable Bundle data,
- @NonNull CancellationSignal cancellationSignal, @NonNull FillCallback callback) {
- // Should never be called because it was abstract before.
- throw new UnsupportedOperationException("deprecated");
- }
+ public abstract void onFillRequest(@NonNull AssistStructure structure, @Nullable Bundle data,
+ int flags, @NonNull CancellationSignal cancellationSignal,
+ @NonNull FillCallback callback);
/**
* Called when user requests service to save the fields of an {@link Activity}.