Merge "Removed deprecated ContentCaptureEventsRequest" (72ee558b) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -6385,20 +6385,12 @@ package android.service.carrier {

		package android.service.contentcapture {

		@Deprecated public final class ContentCaptureEventsRequest implements android.os.Parcelable {
		method @Deprecated public int describeContents();
		method @Deprecated @NonNull public java.util.List<android.view.contentcapture.ContentCaptureEvent> getEvents();
		method @Deprecated public void writeToParcel(android.os.Parcel, int);
		field @Deprecated public static final android.os.Parcelable.Creator<android.service.contentcapture.ContentCaptureEventsRequest> CREATOR;
		}

		public abstract class ContentCaptureService extends android.app.Service {
		ctor public ContentCaptureService();
		method public final void disableContentCaptureServices();
		method public void onActivitySnapshot(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.service.contentcapture.SnapshotData);
		method public void onConnected();
		method public void onContentCaptureEvent(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.view.contentcapture.ContentCaptureEvent);
		method @Deprecated public void onContentCaptureEventsRequest(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.service.contentcapture.ContentCaptureEventsRequest);
		method public void onCreateContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext, @NonNull android.view.contentcapture.ContentCaptureSessionId);
		method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);
		method public void onDisconnected();

api/test-current.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -2126,20 +2126,12 @@ package android.service.autofill.augmented {

		package android.service.contentcapture {

		@Deprecated public final class ContentCaptureEventsRequest implements android.os.Parcelable {
		method @Deprecated public int describeContents();
		method @Deprecated @NonNull public java.util.List<android.view.contentcapture.ContentCaptureEvent> getEvents();
		method @Deprecated public void writeToParcel(android.os.Parcel, int);
		field @Deprecated public static final android.os.Parcelable.Creator<android.service.contentcapture.ContentCaptureEventsRequest> CREATOR;
		}

		public abstract class ContentCaptureService extends android.app.Service {
		ctor public ContentCaptureService();
		method public final void disableContentCaptureServices();
		method public void onActivitySnapshot(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.service.contentcapture.SnapshotData);
		method public void onConnected();
		method public void onContentCaptureEvent(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.view.contentcapture.ContentCaptureEvent);
		method @Deprecated public void onContentCaptureEventsRequest(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.service.contentcapture.ContentCaptureEventsRequest);
		method public void onCreateContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext, @NonNull android.view.contentcapture.ContentCaptureSessionId);
		method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId);
		method public void onDisconnected();

core/java/android/service/contentcapture/ContentCaptureEventsRequest.aidl

deleted100644 → 0

+0 −19

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2018, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.service.contentcapture;

		parcelable ContentCaptureEventsRequest;

core/java/android/service/contentcapture/ContentCaptureEventsRequest.java

deleted100644 → 0

+0 −80

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package android.service.contentcapture;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.view.contentcapture.ContentCaptureEvent;

		import java.util.Arrays;
		import java.util.List;

		/**
		* Not needed anymore...
		*
		* @deprecated ContentCaptureService should use
		* {@code #onContentCaptureEvent(ContentCaptureSessionId, ContentCaptureEvent)} instead.
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		@Deprecated
		public final class ContentCaptureEventsRequest implements Parcelable {
		// TODO(b/121051220): remove .java and .aidl once service implementation doesn't use it anymore

		private final ContentCaptureEvent mEvent;

		/** @hide */
		public ContentCaptureEventsRequest(@NonNull ContentCaptureEvent event) {
		mEvent = event;
		}

		/**
		* Gets the events.
		*/
		@NonNull
		public List<ContentCaptureEvent> getEvents() {
		return Arrays.asList(mEvent);
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel parcel, int flags) {
		parcel.writeParcelable(mEvent, flags);
		}

		public static final Parcelable.Creator<ContentCaptureEventsRequest> CREATOR =
		new Parcelable.Creator<ContentCaptureEventsRequest>() {

		@Override
		public ContentCaptureEventsRequest createFromParcel(Parcel parcel) {
		return new ContentCaptureEventsRequest(parcel.readParcelable(null));
		}

		@Override
		public ContentCaptureEventsRequest[] newArray(int size) {
		return new ContentCaptureEventsRequest[size];
		}
		};
		}

core/java/android/service/contentcapture/ContentCaptureService.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -233,17 +233,6 @@ public abstract class ContentCaptureService extends Service {
		}
		}

		/**
		*
		* @deprecated use {@link #onContentCaptureEvent(ContentCaptureSessionId, ContentCaptureEvent)}
		* instead.
		*/
		@Deprecated
		public void onContentCaptureEventsRequest(@NonNull ContentCaptureSessionId sessionId,
		@NonNull ContentCaptureEventsRequest request) {
		if (sVerbose) Log.v(TAG, "onContentCaptureEventsRequest(id=" + sessionId + ")");
		}

		/**
		* Notifies the service of {@link ContentCaptureEvent events} associated with a content capture
		* session.
		@@ -254,7 +243,6 @@ public abstract class ContentCaptureService extends Service {
		public void onContentCaptureEvent(@NonNull ContentCaptureSessionId sessionId,
		@NonNull ContentCaptureEvent event) {
		if (sVerbose) Log.v(TAG, "onContentCaptureEventsRequest(id=" + sessionId + ")");
		onContentCaptureEventsRequest(sessionId, new ContentCaptureEventsRequest(event));
		}

		/**