Merge "Move away from @hide in browser aidl files" into androidx-main am: 68b39200c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2590625
Change-Id: I7a15e1f5cccef39154753b17c033c929c315f6d1
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsCallback.aidl b/browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsCallback.aidl
index a2be168..c18d806 100644
--- a/browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsCallback.aidl
+++ b/browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsCallback.aidl
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package android.support.customtabs;
-/* @hide */
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface ICustomTabsCallback {
oneway void onNavigationEvent(int navigationEvent, in android.os.Bundle extras) = 1;
oneway void extraCallback(String callbackName, in android.os.Bundle args) = 2;
diff --git a/browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsService.aidl b/browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsService.aidl
index bdffe9c..e289f12 100644
--- a/browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsService.aidl
+++ b/browser/browser/api/aidlRelease/current/android/support/customtabs/ICustomTabsService.aidl
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package android.support.customtabs;
-/* @hide */
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface ICustomTabsService {
boolean warmup(long flags) = 1;
boolean newSession(in android.support.customtabs.ICustomTabsCallback callback) = 2;
diff --git a/browser/browser/api/aidlRelease/current/android/support/customtabs/IEngagementSignalsCallback.aidl b/browser/browser/api/aidlRelease/current/android/support/customtabs/IEngagementSignalsCallback.aidl
index c58eced..f3e5fd8 100644
--- a/browser/browser/api/aidlRelease/current/android/support/customtabs/IEngagementSignalsCallback.aidl
+++ b/browser/browser/api/aidlRelease/current/android/support/customtabs/IEngagementSignalsCallback.aidl
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package android.support.customtabs;
-/* @hide */
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IEngagementSignalsCallback {
oneway void onVerticalScrollEvent(boolean isDirectionUp, in android.os.Bundle extras) = 1;
oneway void onGreatestScrollPercentageIncreased(int scrollPercentage, in android.os.Bundle extras) = 2;
diff --git a/browser/browser/api/aidlRelease/current/android/support/customtabs/IPostMessageService.aidl b/browser/browser/api/aidlRelease/current/android/support/customtabs/IPostMessageService.aidl
index 353498f..107ad164 100644
--- a/browser/browser/api/aidlRelease/current/android/support/customtabs/IPostMessageService.aidl
+++ b/browser/browser/api/aidlRelease/current/android/support/customtabs/IPostMessageService.aidl
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package android.support.customtabs;
-/* @hide */
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IPostMessageService {
void onMessageChannelReady(in android.support.customtabs.ICustomTabsCallback callback, in android.os.Bundle extras) = 1;
void onPostMessage(in android.support.customtabs.ICustomTabsCallback callback, String message, in android.os.Bundle extras) = 2;
diff --git a/browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl b/browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl
index 5b10111..f5f8679 100644
--- a/browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl
+++ b/browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package android.support.customtabs.trusted;
-/* @hide */
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface ITrustedWebActivityCallback {
void onExtraCallback(String callbackName, in android.os.Bundle bundle) = 1;
}
diff --git a/browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityService.aidl b/browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityService.aidl
index 96e530d..f7beed4 100644
--- a/browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityService.aidl
+++ b/browser/browser/api/aidlRelease/current/android/support/customtabs/trusted/ITrustedWebActivityService.aidl
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package android.support.customtabs.trusted;
-/* @hide */
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface ITrustedWebActivityService {
android.os.Bundle areNotificationsEnabled(in android.os.Bundle args) = 5;
android.os.Bundle notifyNotificationWithChannel(in android.os.Bundle args) = 1;
diff --git a/browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsCallback.aidl b/browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsCallback.aidl
index 1e17fa7..c868161 100644
--- a/browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsCallback.aidl
+++ b/browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsCallback.aidl
@@ -21,8 +21,8 @@
/**
* Interface to a CustomTabsCallback.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface ICustomTabsCallback {
oneway void onNavigationEvent(int navigationEvent, in Bundle extras) = 1;
oneway void extraCallback(String callbackName, in Bundle args) = 2;
diff --git a/browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsService.aidl b/browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsService.aidl
index 3fdc601..cccdf3c8 100644
--- a/browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsService.aidl
+++ b/browser/browser/src/main/stableAidl/android/support/customtabs/ICustomTabsService.aidl
@@ -26,8 +26,8 @@
/**
* Interface to a CustomTabsService.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface ICustomTabsService {
boolean warmup(long flags) = 1;
boolean newSession(in ICustomTabsCallback callback) = 2;
diff --git a/browser/browser/src/main/stableAidl/android/support/customtabs/IEngagementSignalsCallback.aidl b/browser/browser/src/main/stableAidl/android/support/customtabs/IEngagementSignalsCallback.aidl
index 50ec270..091f8ab 100644
--- a/browser/browser/src/main/stableAidl/android/support/customtabs/IEngagementSignalsCallback.aidl
+++ b/browser/browser/src/main/stableAidl/android/support/customtabs/IEngagementSignalsCallback.aidl
@@ -20,8 +20,8 @@
/**
* Interface to an EngagementSignalsCallback.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IEngagementSignalsCallback {
oneway void onVerticalScrollEvent(boolean isDirectionUp, in Bundle extras) = 1;
oneway void onGreatestScrollPercentageIncreased(int scrollPercentage, in Bundle extras) = 2;
diff --git a/browser/browser/src/main/stableAidl/android/support/customtabs/IPostMessageService.aidl b/browser/browser/src/main/stableAidl/android/support/customtabs/IPostMessageService.aidl
index 2c8a605..3193141 100644
--- a/browser/browser/src/main/stableAidl/android/support/customtabs/IPostMessageService.aidl
+++ b/browser/browser/src/main/stableAidl/android/support/customtabs/IPostMessageService.aidl
@@ -22,8 +22,8 @@
/**
* Interface to a PostMessageService.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IPostMessageService {
void onMessageChannelReady(in ICustomTabsCallback callback, in Bundle extras) = 1;
void onPostMessage(in ICustomTabsCallback callback, String message, in Bundle extras) = 2;
diff --git a/browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl b/browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl
index d445480..41533dc 100644
--- a/browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl
+++ b/browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityCallback.aidl
@@ -20,8 +20,8 @@
/**
* Interface to a TrustedWebActivityCallback.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface ITrustedWebActivityCallback {
void onExtraCallback(String callbackName, in Bundle bundle) = 1;
}
diff --git a/browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityService.aidl b/browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityService.aidl
index 36634b2..3b7d147f 100644
--- a/browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityService.aidl
+++ b/browser/browser/src/main/stableAidl/android/support/customtabs/trusted/ITrustedWebActivityService.aidl
@@ -20,8 +20,8 @@
/**
* Interface to a TrustedWebActivityService.
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface ITrustedWebActivityService {
Bundle areNotificationsEnabled(in Bundle args) = 5;
Bundle notifyNotificationWithChannel(in Bundle args) = 1;
