Merge "Remove uses of @hide in room libraries" into androidx-main
diff --git a/room/room-common/api/restricted_current.txt b/room/room-common/api/restricted_current.txt
index 139f37e..85cc4ca 100644
--- a/room/room-common/api/restricted_current.txt
+++ b/room/room-common/api/restricted_current.txt
@@ -360,6 +360,7 @@
method public static String createInsertQuery(String hash);
field public static final String CREATE_QUERY = "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)";
field public static final String DEFAULT_ID = "42";
+ field public static final androidx.room.RoomMasterTable INSTANCE;
field public static final String NAME = "room_master_table";
field public static final String READ_QUERY = "SELECT identity_hash FROM room_master_table WHERE id = 42 LIMIT 1";
field public static final String TABLE_NAME = "room_master_table";
diff --git a/room/room-common/lint-baseline.xml b/room/room-common/lint-baseline.xml
deleted file mode 100644
index 1caa6b9..0000000
--- a/room/room-common/lint-baseline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-beta03)" variant="all" version="8.1.0-alpha07">
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="public object AmbiguousColumnResolver {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/AmbiguousColumnResolver.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="public object RoomMasterTable {"
- errorLine2=" ~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomMasterTable.kt"/>
- </issue>
-
-</issues>
diff --git a/room/room-common/src/main/java/androidx/room/AmbiguousColumnResolver.kt b/room/room-common/src/main/java/androidx/room/AmbiguousColumnResolver.kt
index e0576d1..11448f6 100644
--- a/room/room-common/src/main/java/androidx/room/AmbiguousColumnResolver.kt
+++ b/room/room-common/src/main/java/androidx/room/AmbiguousColumnResolver.kt
@@ -46,7 +46,6 @@
* is the current best. The algorithms prefers a solution whose matches ranges don't overlap and
* are continuous.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
public object AmbiguousColumnResolver {
diff --git a/room/room-common/src/main/java/androidx/room/RoomMasterTable.kt b/room/room-common/src/main/java/androidx/room/RoomMasterTable.kt
index 0cdd520..4af3272 100644
--- a/room/room-common/src/main/java/androidx/room/RoomMasterTable.kt
+++ b/room/room-common/src/main/java/androidx/room/RoomMasterTable.kt
@@ -22,7 +22,6 @@
/**
* Schema information about Room's master table.
*
- * @hide
*/
@SuppressWarnings("WeakerAccess")
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
diff --git a/room/room-runtime/api/aidlRelease/current/androidx/room/IMultiInstanceInvalidationCallback.aidl b/room/room-runtime/api/aidlRelease/current/androidx/room/IMultiInstanceInvalidationCallback.aidl
index 17586bd..b1b0fe2 100644
--- a/room/room-runtime/api/aidlRelease/current/androidx/room/IMultiInstanceInvalidationCallback.aidl
+++ b/room/room-runtime/api/aidlRelease/current/androidx/room/IMultiInstanceInvalidationCallback.aidl
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package androidx.room;
-/* @hide */
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IMultiInstanceInvalidationCallback {
oneway void onInvalidation(in String[] tables);
}
diff --git a/room/room-runtime/api/aidlRelease/current/androidx/room/IMultiInstanceInvalidationService.aidl b/room/room-runtime/api/aidlRelease/current/androidx/room/IMultiInstanceInvalidationService.aidl
index 19e8734..92245f1 100644
--- a/room/room-runtime/api/aidlRelease/current/androidx/room/IMultiInstanceInvalidationService.aidl
+++ b/room/room-runtime/api/aidlRelease/current/androidx/room/IMultiInstanceInvalidationService.aidl
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.
package androidx.room;
-/* @hide */
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IMultiInstanceInvalidationService {
int registerCallback(androidx.room.IMultiInstanceInvalidationCallback callback, String name);
void unregisterCallback(androidx.room.IMultiInstanceInvalidationCallback callback, int clientId);
diff --git a/room/room-runtime/lint-baseline.xml b/room/room-runtime/lint-baseline.xml
index e72c996..3774d1b 100644
--- a/room/room-runtime/lint-baseline.xml
+++ b/room/room-runtime/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-alpha07" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-beta03)" variant="all" version="8.1.0-alpha07">
+<issues format="6" by="lint 8.1.0-beta02" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta02)" variant="all" version="8.1.0-beta02">
<issue
id="NewApi"
@@ -11,240 +11,6 @@
</issue>
<issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="class FtsTableInfo("
- errorLine2=" ~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/util/FtsTableInfo.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" constructor(database: RoomDatabase, vararg tableNames: String) :"
- errorLine2=" ~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/InvalidationTracker.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" open fun addWeakObserver(observer: Observer) {"
- errorLine2=" ~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/InvalidationTracker.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" open fun refreshVersionsSync() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/InvalidationTracker.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" fun notifyObserversByTableNames(vararg tables: String) {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/InvalidationTracker.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" open fun <T> createLiveData("
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/InvalidationTracker.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" open fun <T> createLiveData("
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/InvalidationTracker.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="public abstract class LimitOffsetDataSource<T> extends androidx.paging.PositionalDataSource<T> {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/paging/LimitOffsetDataSource.java"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" public int countItems() {"
- errorLine2=" ~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/paging/LimitOffsetDataSource.java"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" public List<T> loadRange(int startPosition, int loadCount) {"
- errorLine2=" ~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/paging/LimitOffsetDataSource.java"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" protected var mCallbacks: List<Callback>? = null"
- errorLine2=" ~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomDatabase.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" protected var autoMigrationSpecs: MutableMap<Class<out AutoMigrationSpec>, AutoMigrationSpec> ="
- errorLine2=" ~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomDatabase.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" val backingFieldMap: MutableMap<String, Any> = Collections.synchronizedMap(mutableMapOf())"
- errorLine2=" ~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomDatabase.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" open fun getAutoMigrations("
- errorLine2=" ~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomDatabase.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" open fun getRequiredAutoMigrationSpecs(): Set<Class<out AutoMigrationSpec>> {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomDatabase.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" open fun assertNotMainThread() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomDatabase.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" open fun assertNotSuspendingTransaction() {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomDatabase.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" const val MAX_BIND_PARAMETER_CNT = 999"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomDatabase.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="open class RoomOpenHelper("
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomOpenHelper.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" abstract class Delegate(@JvmField val version: Int) {"
- errorLine2=" ~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomOpenHelper.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" open class ValidationResult("
- errorLine2=" ~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomOpenHelper.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="class RoomSQLiteQuery private constructor("
- errorLine2=" ~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/RoomSQLiteQuery.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="class TableInfo("
- errorLine2=" ~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/util/TableInfo.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" class ForeignKey("
- errorLine2=" ~~~~~~~~~~">
- <location
- file="src/main/java/androidx/room/util/TableInfo.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1=" class Index("
- errorLine2=" ~~~~~">
- <location
- file="src/main/java/androidx/room/util/TableInfo.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="class ViewInfo("
- errorLine2=" ~~~~~~~~">
- <location
- file="src/main/java/androidx/room/util/ViewInfo.kt"/>
- </issue>
-
- <issue
id="BanThreadSleep"
message="Uses Thread.sleep()"
errorLine1=" Thread.sleep(5)"
@@ -397,22 +163,4 @@
file="src/test/java/androidx/room/TransactionExecutorTest.kt"/>
</issue>
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="interface IMultiInstanceInvalidationCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/room/IMultiInstanceInvalidationCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="interface IMultiInstanceInvalidationService {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/room/IMultiInstanceInvalidationService.aidl"/>
- </issue>
-
</issues>
diff --git a/room/room-runtime/src/main/java/androidx/room/InvalidationTracker.kt b/room/room-runtime/src/main/java/androidx/room/InvalidationTracker.kt
index 0117214..91b934a 100644
--- a/room/room-runtime/src/main/java/androidx/room/InvalidationTracker.kt
+++ b/room/room-runtime/src/main/java/androidx/room/InvalidationTracker.kt
@@ -111,7 +111,6 @@
/**
* Used by the generated code.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
constructor(database: RoomDatabase, vararg tableNames: String) :
@@ -302,7 +301,6 @@
* when the observer is GC'ed.
*
* @param observer The observer to which InvalidationTracker will keep a weak reference.
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
open fun addWeakObserver(observer: Observer) {
@@ -445,7 +443,6 @@
/**
* Check versions for tables, and run observers synchronously if tables have been updated.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
@WorkerThread
@@ -463,7 +460,6 @@
* [InvalidationTracker], for example, invalidation from another process.
*
* @param tables The invalidated tables.
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY)
fun notifyObserversByTableNames(vararg tables: String) {
@@ -542,7 +538,6 @@
* @param T The return type
* @return A new LiveData that computes the given function when the given list of tables
* invalidates.
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
@Deprecated("Use [createLiveData(String[], boolean, Callable)]")
@@ -566,7 +561,6 @@
* @param T The return type
* @return A new LiveData that computes the given function when the given list of tables
* invalidates.
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
open fun <T> createLiveData(
diff --git a/room/room-runtime/src/main/java/androidx/room/RoomDatabase.kt b/room/room-runtime/src/main/java/androidx/room/RoomDatabase.kt
index fd8e753..bc86569 100644
--- a/room/room-runtime/src/main/java/androidx/room/RoomDatabase.kt
+++ b/room/room-runtime/src/main/java/androidx/room/RoomDatabase.kt
@@ -110,7 +110,6 @@
private var writeAheadLoggingEnabled = false
/**
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
@Deprecated("Will be hidden in a future release.")
@@ -120,9 +119,9 @@
/**
* A map of auto migration spec classes to their provided instance.
*
- * @hide
*/
- @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+ @set:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+ @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
protected var autoMigrationSpecs: MutableMap<Class<out AutoMigrationSpec>, AutoMigrationSpec> =
mutableMapOf()
private val readWriteLock = ReentrantReadWriteLock()
@@ -154,7 +153,6 @@
/**
* Gets the map for storing extension properties of Kotlin type.
*
- * @hide
*/
@get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
val backingFieldMap: MutableMap<String, Any> = Collections.synchronizedMap(mutableMapOf())
@@ -298,7 +296,6 @@
* @return A list of migration instances each of which is a generated autoMigration
* @param autoMigrationSpecs
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@JvmSuppressWildcards // Suppress wildcards due to generated Java code
@@ -369,7 +366,6 @@
*
* @return Creates a set that will include all required auto migration specs for this database.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
open fun getRequiredAutoMigrationSpecs(): Set<Class<out AutoMigrationSpec>> {
@@ -434,7 +430,6 @@
/**
* Asserts that we are not on the main thread.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX) // used in generated code
open fun assertNotMainThread() {
@@ -450,7 +445,6 @@
/**
* Asserts that we are not on a suspending transaction.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used in generated code
open fun assertNotSuspendingTransaction() {
@@ -1546,7 +1540,6 @@
/**
* Unfortunately, we cannot read this value so we are only setting it to the SQLite default.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
const val MAX_BIND_PARAMETER_CNT = 999
diff --git a/room/room-runtime/src/main/java/androidx/room/RoomOpenHelper.kt b/room/room-runtime/src/main/java/androidx/room/RoomOpenHelper.kt
index 929dcca..44f7f15 100644
--- a/room/room-runtime/src/main/java/androidx/room/RoomOpenHelper.kt
+++ b/room/room-runtime/src/main/java/androidx/room/RoomOpenHelper.kt
@@ -24,7 +24,6 @@
/**
* An open helper that holds a reference to the configuration until the database is opened.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
open class RoomOpenHelper(
@@ -175,7 +174,6 @@
}
/**
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
abstract class Delegate(@JvmField val version: Int) {
@@ -219,7 +217,6 @@
}
/**
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
open class ValidationResult(
diff --git a/room/room-runtime/src/main/java/androidx/room/RoomSQLiteQuery.kt b/room/room-runtime/src/main/java/androidx/room/RoomSQLiteQuery.kt
index c13695e..f04d520 100644
--- a/room/room-runtime/src/main/java/androidx/room/RoomSQLiteQuery.kt
+++ b/room/room-runtime/src/main/java/androidx/room/RoomSQLiteQuery.kt
@@ -29,7 +29,6 @@
*
* Because it is relatively a big object, they are pooled and must be released after each use.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
class RoomSQLiteQuery private constructor(
diff --git a/room/room-runtime/src/main/java/androidx/room/paging/LimitOffsetDataSource.java b/room/room-runtime/src/main/java/androidx/room/paging/LimitOffsetDataSource.java
index 81ba417..2b5c391 100644
--- a/room/room-runtime/src/main/java/androidx/room/paging/LimitOffsetDataSource.java
+++ b/room/room-runtime/src/main/java/androidx/room/paging/LimitOffsetDataSource.java
@@ -46,7 +46,6 @@
*
* @param <T> Data type returned by the data source.
*
- * @hide
*/
@SuppressWarnings("deprecation")
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
@@ -117,8 +116,8 @@
/**
* Count number of rows query can return
*
- * @hide
*/
+ @RestrictTo(RestrictTo.Scope.LIBRARY)
@SuppressWarnings("WeakerAccess")
public int countItems() {
registerObserverIfNecessary();
@@ -194,8 +193,8 @@
/**
* Return the rows from startPos to startPos + loadCount
*
- * @hide
*/
+ @RestrictTo(RestrictTo.Scope.LIBRARY)
@SuppressWarnings("deprecation")
@NonNull
public List<T> loadRange(int startPosition, int loadCount) {
diff --git a/room/room-runtime/src/main/java/androidx/room/util/FtsTableInfo.kt b/room/room-runtime/src/main/java/androidx/room/util/FtsTableInfo.kt
index f6fa32d..e439ee5 100644
--- a/room/room-runtime/src/main/java/androidx/room/util/FtsTableInfo.kt
+++ b/room/room-runtime/src/main/java/androidx/room/util/FtsTableInfo.kt
@@ -24,7 +24,6 @@
/**
* A data class that holds the information about an FTS table.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
class FtsTableInfo(
diff --git a/room/room-runtime/src/main/java/androidx/room/util/TableInfo.kt b/room/room-runtime/src/main/java/androidx/room/util/TableInfo.kt
index 50518c1..246dfdc 100644
--- a/room/room-runtime/src/main/java/androidx/room/util/TableInfo.kt
+++ b/room/room-runtime/src/main/java/androidx/room/util/TableInfo.kt
@@ -36,7 +36,6 @@
*
* Even though SQLite column names are case insensitive, this class uses case sensitive matching.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
// if you change this class, you must change TableInfoValidationWriter.kt
@@ -334,7 +333,6 @@
/**
* Holds the information about an SQLite foreign key
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
class ForeignKey(
@@ -398,7 +396,6 @@
/**
* Holds the information about an SQLite index
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
class Index(
diff --git a/room/room-runtime/src/main/java/androidx/room/util/UUIDUtil.kt b/room/room-runtime/src/main/java/androidx/room/util/UUIDUtil.kt
index e5c9198..4d7810c 100644
--- a/room/room-runtime/src/main/java/androidx/room/util/UUIDUtil.kt
+++ b/room/room-runtime/src/main/java/androidx/room/util/UUIDUtil.kt
@@ -25,7 +25,6 @@
/**
* UUID / byte[] two-way conversion utility for Room
*
- * @hide
*/
/**
diff --git a/room/room-runtime/src/main/java/androidx/room/util/ViewInfo.kt b/room/room-runtime/src/main/java/androidx/room/util/ViewInfo.kt
index 83e7e80..6c664ce 100644
--- a/room/room-runtime/src/main/java/androidx/room/util/ViewInfo.kt
+++ b/room/room-runtime/src/main/java/androidx/room/util/ViewInfo.kt
@@ -27,7 +27,6 @@
*
* Even though SQLite column names are case insensitive, this class uses case sensitive matching.
*
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
class ViewInfo(
diff --git a/room/room-runtime/src/main/stableAidl/androidx/room/IMultiInstanceInvalidationCallback.aidl b/room/room-runtime/src/main/stableAidl/androidx/room/IMultiInstanceInvalidationCallback.aidl
index 7c702ff..bc76559 100644
--- a/room/room-runtime/src/main/stableAidl/androidx/room/IMultiInstanceInvalidationCallback.aidl
+++ b/room/room-runtime/src/main/stableAidl/androidx/room/IMultiInstanceInvalidationCallback.aidl
@@ -18,9 +18,8 @@
/**
* RPC Callbacks for {@link IMultiInstanceInvalidationService}.
- *
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IMultiInstanceInvalidationCallback {
/**
diff --git a/room/room-runtime/src/main/stableAidl/androidx/room/IMultiInstanceInvalidationService.aidl b/room/room-runtime/src/main/stableAidl/androidx/room/IMultiInstanceInvalidationService.aidl
index 3b2c18c..cd8106b 100644
--- a/room/room-runtime/src/main/stableAidl/androidx/room/IMultiInstanceInvalidationService.aidl
+++ b/room/room-runtime/src/main/stableAidl/androidx/room/IMultiInstanceInvalidationService.aidl
@@ -20,9 +20,8 @@
/**
* RPC Service that controls interaction about multi-instance invalidation.
- *
- * @hide
*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY)")
interface IMultiInstanceInvalidationService {
/**
