Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Promote System APIs to also be Test APIs for Content Capture Data

Browse Source 
Sharing.

This is to be able to test them with CTS suite.

Bug: 145205247
Test: built Android, CTS is coming.
Change-Id: I28cc804be06ee3adbfd1e139803eed2ab10715ca
This commit is contained in:
Sergey Volnov
2020-02-11 23:27:21 +00:00
parent 59b663bcd4
commit 0115ede5b4
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/test-current.txt
View File

@@ -3246,6 +3246,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>);
@@ -3254,6 +3255,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();

1
core/java/android/service/contentcapture/ContentCaptureService.java
View File

@@ -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()");

2
core/java/android/service/contentcapture/DataShareCallback.java
View File

@@ -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.

2
core/java/android/service/contentcapture/DataShareReadAdapter.java
View File

@@ -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 {
/**