Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fc4966a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Promote System APIs to also be Test APIs for Content Capture Data Sharing."

parents 166e81fe 0115ede5

api/test-current.txt

+11 −0
Original line number Diff line number Diff line
@@ -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();

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

+1 −0
Original line number Diff line number Diff line
@@ -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()");

core/java/android/service/contentcapture/DataShareCallback.java

+2 −0
Original line number Diff line number Diff line
@@ -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.

core/java/android/service/contentcapture/DataShareReadAdapter.java

+2 −0
Original line number Diff line number Diff line
@@ -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 {



    /**