diff --git a/core/java/android/service/contentcapture/DataShareReadAdapter.java b/core/java/android/service/contentcapture/DataShareReadAdapter.java index a481ec8382edc..8cd9eea1e6e09 100644 --- a/core/java/android/service/contentcapture/DataShareReadAdapter.java +++ b/core/java/android/service/contentcapture/DataShareReadAdapter.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.TestApi; import android.os.ParcelFileDescriptor; +import android.view.contentcapture.ContentCaptureManager.DataShareError; /** * Adapter class to be used for the Content Capture Service app to propagate the status of the @@ -46,5 +47,5 @@ public interface DataShareReadAdapter { * these 2 events is not defined, and it's important that the service treats end of stream * correctly in this situation. **/ - void onError(int errorCode); + void onError(@DataShareError int errorCode); } diff --git a/core/java/android/view/contentcapture/ContentCaptureManager.java b/core/java/android/view/contentcapture/ContentCaptureManager.java index b7b54c8c74b9b..b9889276ae0b5 100644 --- a/core/java/android/view/contentcapture/ContentCaptureManager.java +++ b/core/java/android/view/contentcapture/ContentCaptureManager.java @@ -216,6 +216,15 @@ public final class ContentCaptureManager { /** Request has been interrupted because of data share session timeout. */ public static final int DATA_SHARE_ERROR_TIMEOUT_INTERRUPTED = 3; + /** @hide */ + @IntDef(flag = false, value = { + DATA_SHARE_ERROR_UNKNOWN, + DATA_SHARE_ERROR_CONCURRENT_REQUEST, + DATA_SHARE_ERROR_TIMEOUT_INTERRUPTED + }) + @Retention(RetentionPolicy.SOURCE) + public @interface DataShareError {} + /** @hide */ public static final int RESULT_CODE_OK = 0; /** @hide */ diff --git a/core/java/android/view/contentcapture/DataShareWriteAdapter.java b/core/java/android/view/contentcapture/DataShareWriteAdapter.java index 2beaededf8b1e..3b5b756553d91 100644 --- a/core/java/android/view/contentcapture/DataShareWriteAdapter.java +++ b/core/java/android/view/contentcapture/DataShareWriteAdapter.java @@ -18,6 +18,7 @@ package android.view.contentcapture; import android.annotation.NonNull; import android.os.ParcelFileDescriptor; +import android.view.contentcapture.ContentCaptureManager.DataShareError; /** Adapter class used by apps to share data with the Content Capture service. */ public interface DataShareWriteAdapter { @@ -42,7 +43,7 @@ public interface DataShareWriteAdapter { * * @param errorCode the error code corresponding to an ERROR_* value. */ - default void onError(int errorCode) { + default void onError(@DataShareError int errorCode) { /* do nothing - stub */ } }