Merge "Make new onFill/onSave methods abstract." into oc-dev (3411adc4) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -37024,8 +37024,8 @@ package android.service.autofill {
	method public final android.os.IBinder onBind(android.content.Intent);		method public final android.os.IBinder onBind(android.content.Intent);
	method public void onConnected();		method public void onConnected();
	method public void onDisconnected();		method public void onDisconnected();
	method public void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);		method public abstract void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);
	method public void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback);		method public abstract void onSaveRequest(android.service.autofill.SaveRequest, 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_INTERFACE = "android.service.autofill.AutofillService";
	field public static final java.lang.String SERVICE_META_DATA = "android.autofill";		field public static final java.lang.String SERVICE_META_DATA = "android.autofill";
	}		}

api/system-current.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -40140,8 +40140,8 @@ package android.service.autofill {
	method public final android.os.IBinder onBind(android.content.Intent);		method public final android.os.IBinder onBind(android.content.Intent);
	method public void onConnected();		method public void onConnected();
	method public void onDisconnected();		method public void onDisconnected();
	method public void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);		method public abstract void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);
	method public void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback);		method public abstract void onSaveRequest(android.service.autofill.SaveRequest, 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_INTERFACE = "android.service.autofill.AutofillService";
	field public static final java.lang.String SERVICE_META_DATA = "android.autofill";		field public static final java.lang.String SERVICE_META_DATA = "android.autofill";
	}		}

api/test-current.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -37178,8 +37178,8 @@ package android.service.autofill {
	method public final android.os.IBinder onBind(android.content.Intent);		method public final android.os.IBinder onBind(android.content.Intent);
	method public void onConnected();		method public void onConnected();
	method public void onDisconnected();		method public void onDisconnected();
	method public void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);		method public abstract void onFillRequest(android.service.autofill.FillRequest, android.os.CancellationSignal, android.service.autofill.FillCallback);
	method public void onSaveRequest(android.service.autofill.SaveRequest, android.service.autofill.SaveCallback);		method public abstract void onSaveRequest(android.service.autofill.SaveRequest, 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_INTERFACE = "android.service.autofill.AutofillService";
	field public static final java.lang.String SERVICE_META_DATA = "android.autofill";		field public static final java.lang.String SERVICE_META_DATA = "android.autofill";
	}		}

core/java/android/service/autofill/AutofillService.java

+19 −12

Original line number	Original line	Diff line number	Diff line
	@@ -114,7 +114,13 @@ public abstract class AutofillService extends Service {
	final IFillCallback callback = (IFillCallback) args.arg3;		final IFillCallback callback = (IFillCallback) args.arg3;
	final FillCallback fillCallback = new FillCallback(callback, request.getId());		final FillCallback fillCallback = new FillCallback(callback, request.getId());
	args.recycle();		args.recycle();
			// TODO(b/37563972): temporary try-catch hack to support old method
			try {
	onFillRequest(request, cancellation, fillCallback);		onFillRequest(request, cancellation, fillCallback);
			} catch (AbstractMethodError e) {
			onFillRequest(request.getStructure(), request.getClientState(),
			request.getFlags(), cancellation, fillCallback);
			}
	break;		break;
	} case MSG_ON_SAVE_REQUEST: {		} case MSG_ON_SAVE_REQUEST: {
	final SomeArgs args = (SomeArgs) msg.obj;		final SomeArgs args = (SomeArgs) msg.obj;
	@@ -122,7 +128,14 @@ public abstract class AutofillService extends Service {
	final ISaveCallback callback = (ISaveCallback) args.arg2;		final ISaveCallback callback = (ISaveCallback) args.arg2;
	final SaveCallback saveCallback = new SaveCallback(callback);		final SaveCallback saveCallback = new SaveCallback(callback);
	args.recycle();		args.recycle();
			// TODO(b/37563972): temporary try-catch hack to support old method
			try {
	onSaveRequest(request, saveCallback);		onSaveRequest(request, saveCallback);
			} catch (AbstractMethodError e) {
			final List<FillContext> contexts = request.getFillContexts();
			onSaveRequest(contexts.get(contexts.size() - 1).getStructure(),
			request.getClientState(), saveCallback);
			}
	break;		break;
	} case MSG_DISCONNECT: {		} case MSG_DISCONNECT: {
	onDisconnected();		onDisconnected();
	@@ -179,11 +192,8 @@ public abstract class AutofillService extends Service {
	* handling this fill request in order to save resources.		* handling this fill request in order to save resources.
	* @param callback object used to notify the result of the request.		* @param callback object used to notify the result of the request.
	*/		*/
	public void onFillRequest(@NonNull FillRequest request,		public abstract void onFillRequest(@NonNull FillRequest request,
	@NonNull CancellationSignal cancellationSignal, @NonNull FillCallback callback) {		@NonNull CancellationSignal cancellationSignal, @NonNull FillCallback callback);
	onFillRequest(request.getStructure(), request.getClientState(), request.getFlags(),
	cancellationSignal, callback);
	}

	/**		/**
	* Called by the Android system do decide if an {@link Activity} can be autofilled by the		* Called by the Android system do decide if an {@link Activity} can be autofilled by the
	@@ -225,11 +235,8 @@ public abstract class AutofillService extends Service {
	* See {@link FillResponse} for examples of multiple-sections requests.		* See {@link FillResponse} for examples of multiple-sections requests.
	* @param callback object used to notify the result of the request.		* @param callback object used to notify the result of the request.
	*/		*/
	public void onSaveRequest(@NonNull SaveRequest request, @NonNull SaveCallback callback) {		public abstract void onSaveRequest(@NonNull SaveRequest request,
	final List<FillContext> contexts = request.getFillContexts();		@NonNull SaveCallback callback);
	onSaveRequest(contexts.get(contexts.size() - 1).getStructure(),
	request.getClientState(), callback);
	}

	/**		/**
	* Called when user requests service to save the fields of an {@link Activity}.		* Called when user requests service to save the fields of an {@link Activity}.