Merge "Remove use of @hide in javascriptengine project" into androidx-main
NOKEYCHECK=True
GitOrigin-RevId: 189c893d556d6c9a46dd661081450f65e29c4d76
diff --git a/main/java/androidx/javascriptengine/JavaScriptConsoleCallback.java b/main/java/androidx/javascriptengine/JavaScriptConsoleCallback.java
index 0faad5f..6b162c7 100644
--- a/main/java/androidx/javascriptengine/JavaScriptConsoleCallback.java
+++ b/main/java/androidx/javascriptengine/JavaScriptConsoleCallback.java
@@ -19,6 +19,7 @@
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
import org.chromium.android_webview.js_sandbox.common.IJsSandboxConsoleCallback;
@@ -35,8 +36,8 @@
final class ConsoleMessage {
/**
* Console message (error) level
- * @hide
*/
+ @RestrictTo(RestrictTo.Scope.LIBRARY)
@IntDef({LEVEL_LOG, LEVEL_DEBUG, LEVEL_INFO, LEVEL_ERROR, LEVEL_WARNING})
@Retention(RetentionPolicy.SOURCE)
public @interface Level {}
diff --git a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxConsoleCallback.aidl b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxConsoleCallback.aidl
index d18086c..d5c1562 100644
--- a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxConsoleCallback.aidl
+++ b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxConsoleCallback.aidl
@@ -18,8 +18,8 @@
/**
* Used to relay console messages to the embedding app.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IJsSandboxConsoleCallback {
// These must be individual bits so that they can be trivially filtered using a bitmask.
const int CONSOLE_MESSAGE_LEVEL_LOG = 1 << 0;
diff --git a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolate.aidl b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolate.aidl
index 1905d4f..3588abe 100644
--- a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolate.aidl
+++ b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolate.aidl
@@ -23,8 +23,8 @@
/**
* Used by the embedding app to execute JavaScript in a sandboxed environment.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IJsSandboxIsolate {
/**
* @param code the JavaScript code
diff --git a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolateCallback.aidl b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolateCallback.aidl
index 4b045e1..eb5a3d7 100644
--- a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolateCallback.aidl
+++ b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolateCallback.aidl
@@ -20,8 +20,8 @@
* Used to communicate the result of the JavaScript evaluation from the
* sandbox to the embedding app.
* DEPRECATED INTERFACE! Do not add methods or constants into this file.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
oneway interface IJsSandboxIsolateCallback {
// An exception was thrown during the JS evaluation.
const int JS_EVALUATION_ERROR = 0;
diff --git a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolateSyncCallback.aidl b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolateSyncCallback.aidl
index 3225a60..9e67eb9 100644
--- a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolateSyncCallback.aidl
+++ b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxIsolateSyncCallback.aidl
@@ -23,8 +23,8 @@
* sandbox to the embedding app.
* This interface is not marked 'oneway' like IJsSandboxIsolateCallback and should be preferred for
* ordering correctness.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IJsSandboxIsolateSyncCallback {
// An exception was thrown during the JS evaluation.
const int JS_EVALUATION_ERROR = 0;
diff --git a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxService.aidl b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxService.aidl
index 2d65770..0453988 100644
--- a/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxService.aidl
+++ b/main/stableAidl/org/chromium/android_webview/js_sandbox/common/IJsSandboxService.aidl
@@ -19,8 +19,8 @@
/**
* Used by the embedding app to execute JavaScript in a sandboxed environment.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IJsSandboxService {
IJsSandboxIsolate createIsolate() = 0;