diff options
4 files changed, 16 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 225f3dc3ee5c..7e8eb0c965ca 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3257,6 +3257,7 @@ package android.service.contentcapture { method public void onContentCaptureEvent(@NonNull android.view.contentcapture.ContentCaptureSessionId, @NonNull android.view.contentcapture.ContentCaptureEvent); method public void onCreateContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureContext, @NonNull android.view.contentcapture.ContentCaptureSessionId); method public void onDataRemovalRequest(@NonNull android.view.contentcapture.DataRemovalRequest); + method public void onDataShareRequest(@NonNull android.view.contentcapture.DataShareRequest, @NonNull android.service.contentcapture.DataShareCallback); method public void onDestroyContentCaptureSession(@NonNull android.view.contentcapture.ContentCaptureSessionId); method public void onDisconnected(); method public final void setContentCaptureConditions(@NonNull String, @Nullable java.util.Set<android.view.contentcapture.ContentCaptureCondition>); @@ -3265,6 +3266,16 @@ package android.service.contentcapture { field public static final String SERVICE_META_DATA = "android.content_capture"; } + public interface DataShareCallback { + method public void onAccept(@NonNull java.util.concurrent.Executor, @NonNull android.service.contentcapture.DataShareReadAdapter); + method public void onReject(); + } + + public interface DataShareReadAdapter { + method public void onError(int); + method public void onStart(@NonNull android.os.ParcelFileDescriptor); + } + public final class SnapshotData implements android.os.Parcelable { method public int describeContents(); method @Nullable public android.app.assist.AssistContent getAssistContent(); diff --git a/core/java/android/service/contentcapture/ContentCaptureService.java b/core/java/android/service/contentcapture/ContentCaptureService.java index 0edd01330fdd..cecfe24613a4 100644 --- a/core/java/android/service/contentcapture/ContentCaptureService.java +++ b/core/java/android/service/contentcapture/ContentCaptureService.java @@ -339,6 +339,7 @@ public abstract class ContentCaptureService extends Service { * @hide */ @SystemApi + @TestApi public void onDataShareRequest(@NonNull DataShareRequest request, @NonNull DataShareCallback callback) { if (sVerbose) Log.v(TAG, "onDataShareRequest()"); diff --git a/core/java/android/service/contentcapture/DataShareCallback.java b/core/java/android/service/contentcapture/DataShareCallback.java index e3c7bb3cd24f..5df8a4b174bf 100644 --- a/core/java/android/service/contentcapture/DataShareCallback.java +++ b/core/java/android/service/contentcapture/DataShareCallback.java @@ -19,6 +19,7 @@ package android.service.contentcapture; import android.annotation.CallbackExecutor; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.annotation.TestApi; import java.util.concurrent.Executor; @@ -32,6 +33,7 @@ import java.util.concurrent.Executor; * @hide **/ @SystemApi +@TestApi public interface DataShareCallback { /** Accept the data share. diff --git a/core/java/android/service/contentcapture/DataShareReadAdapter.java b/core/java/android/service/contentcapture/DataShareReadAdapter.java index b9fce6873c5f..a481ec8382ed 100644 --- a/core/java/android/service/contentcapture/DataShareReadAdapter.java +++ b/core/java/android/service/contentcapture/DataShareReadAdapter.java @@ -18,6 +18,7 @@ package android.service.contentcapture; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.os.ParcelFileDescriptor; /** @@ -27,6 +28,7 @@ import android.os.ParcelFileDescriptor; * @hide **/ @SystemApi +@TestApi public interface DataShareReadAdapter { /** |