Merge "Removed deprecated onFillRequest() method" into oc-dev

am: 7a7c0ace82

Change-Id: I538be771db63f10a6383495147c32848fabe55cd
This commit is contained in:
Felipe Leme
2017-04-06 22:30:09 +00:00
committed by android-build-merger
4 changed files with 6 additions and 21 deletions

View File

@@ -37021,7 +37021,7 @@ package android.service.autofill {
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";

View File

@@ -40092,7 +40092,7 @@ package android.service.autofill {
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";

View File

@@ -37179,7 +37179,7 @@ package android.service.autofill {
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";

View File

@@ -216,24 +216,9 @@ public abstract class AutofillService extends Service {
* 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}.