Merge "Move away from using @hide in benchmark library" into androidx-main
diff --git a/benchmark/benchmark-common/api/current.ignore b/benchmark/benchmark-common/api/current.ignore
index 6bb53f3..bd6e5a8 100644
--- a/benchmark/benchmark-common/api/current.ignore
+++ b/benchmark/benchmark-common/api/current.ignore
@@ -7,6 +7,8 @@
Removed class androidx.benchmark.Api27Kt
RemovedClass: androidx.benchmark.Api29Kt:
Removed class androidx.benchmark.Api29Kt
+RemovedClass: androidx.benchmark.ArgumentsKt:
+ Removed class androidx.benchmark.ArgumentsKt
RemovedClass: androidx.benchmark.ConfigurationErrorKt:
Removed class androidx.benchmark.ConfigurationErrorKt
RemovedClass: androidx.benchmark.MetricNameUtilsKt:
diff --git a/benchmark/benchmark-common/api/current.txt b/benchmark/benchmark-common/api/current.txt
index 80555b0..09744b9 100644
--- a/benchmark/benchmark-common/api/current.txt
+++ b/benchmark/benchmark-common/api/current.txt
@@ -1,9 +1,6 @@
// Signature format: 4.0
package androidx.benchmark {
- public final class ArgumentsKt {
- }
-
public final class BenchmarkState {
ctor @androidx.benchmark.ExperimentalBenchmarkStateApi public BenchmarkState(optional Integer? warmupCount, optional Integer? repeatCount);
method @androidx.benchmark.ExperimentalBenchmarkStateApi public java.util.List<java.lang.Double> getMeasurementTimeNs();
diff --git a/benchmark/benchmark-common/api/restricted_current.ignore b/benchmark/benchmark-common/api/restricted_current.ignore
index 6bb53f3..bd6e5a8 100644
--- a/benchmark/benchmark-common/api/restricted_current.ignore
+++ b/benchmark/benchmark-common/api/restricted_current.ignore
@@ -7,6 +7,8 @@
Removed class androidx.benchmark.Api27Kt
RemovedClass: androidx.benchmark.Api29Kt:
Removed class androidx.benchmark.Api29Kt
+RemovedClass: androidx.benchmark.ArgumentsKt:
+ Removed class androidx.benchmark.ArgumentsKt
RemovedClass: androidx.benchmark.ConfigurationErrorKt:
Removed class androidx.benchmark.ConfigurationErrorKt
RemovedClass: androidx.benchmark.MetricNameUtilsKt:
diff --git a/benchmark/benchmark-common/api/restricted_current.txt b/benchmark/benchmark-common/api/restricted_current.txt
index ca38a9f..83e5643 100644
--- a/benchmark/benchmark-common/api/restricted_current.txt
+++ b/benchmark/benchmark-common/api/restricted_current.txt
@@ -1,9 +1,6 @@
// Signature format: 4.0
package androidx.benchmark {
- public final class ArgumentsKt {
- }
-
public final class BenchmarkState {
ctor @androidx.benchmark.ExperimentalBenchmarkStateApi public BenchmarkState(optional Integer? warmupCount, optional Integer? repeatCount);
method @androidx.benchmark.ExperimentalBenchmarkStateApi public java.util.List<java.lang.Double> getMeasurementTimeNs();
diff --git a/benchmark/benchmark-common/lint-baseline.xml b/benchmark/benchmark-common/lint-baseline.xml
index a0009da..cf93700 100644
--- a/benchmark/benchmark-common/lint-baseline.xml
+++ b/benchmark/benchmark-common/lint-baseline.xml
@@ -1,50 +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">
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="public var argumentSource: Bundle? = null"
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/benchmark/Arguments.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="object Arguments {"
- errorLine2=" ~~~~~~~~~">
- <location
- file="src/main/java/androidx/benchmark/Arguments.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="public object Outputs {"
- errorLine2=" ~~~~~~~">
- <location
- file="src/main/java/androidx/benchmark/Outputs.kt"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="public class ProfileSession {"
- errorLine2=" ~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/benchmark/simpleperf/ProfileSession.java"/>
- </issue>
-
- <issue
- id="BanHideAnnotation"
- message="@hide is not allowed in Javadoc"
- errorLine1="public class RecordOptions {"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/benchmark/simpleperf/RecordOptions.java"/>
- </issue>
+<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="BanThreadSleep"
diff --git a/benchmark/benchmark-common/src/main/java/androidx/benchmark/Arguments.kt b/benchmark/benchmark-common/src/main/java/androidx/benchmark/Arguments.kt
index 81151eb..5b3fe34 100644
--- a/benchmark/benchmark-common/src/main/java/androidx/benchmark/Arguments.kt
+++ b/benchmark/benchmark-common/src/main/java/androidx/benchmark/Arguments.kt
@@ -24,9 +24,10 @@
/**
* This allows tests to override arguments from code
- *
- * @hide
*/
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+@get:RestrictTo(RestrictTo.Scope.LIBRARY)
+@set:RestrictTo(RestrictTo.Scope.LIBRARY)
@VisibleForTesting
public var argumentSource: Bundle? = null
@@ -36,9 +37,6 @@
@VisibleForTesting
internal var profilerOverride: Profiler? = null
-/**
- * @hide
- */
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
object Arguments {
// public properties are shared by micro + macro benchmarks
diff --git a/benchmark/benchmark-common/src/main/java/androidx/benchmark/Outputs.kt b/benchmark/benchmark-common/src/main/java/androidx/benchmark/Outputs.kt
index 959758d..4cbf248 100644
--- a/benchmark/benchmark-common/src/main/java/androidx/benchmark/Outputs.kt
+++ b/benchmark/benchmark-common/src/main/java/androidx/benchmark/Outputs.kt
@@ -26,9 +26,6 @@
import java.util.Date
import java.util.TimeZone
-/**
- * @hide
- */
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
object Outputs {
diff --git a/benchmark/benchmark-common/src/main/java/androidx/benchmark/simpleperf/ProfileSession.java b/benchmark/benchmark-common/src/main/java/androidx/benchmark/simpleperf/ProfileSession.java
index e50a95a..2e33e53 100644
--- a/benchmark/benchmark-common/src/main/java/androidx/benchmark/simpleperf/ProfileSession.java
+++ b/benchmark/benchmark-common/src/main/java/androidx/benchmark/simpleperf/ProfileSession.java
@@ -65,7 +65,6 @@
* NOTE: copied from
* https://cs.android.com/android/platform/superproject/+/master:system/extras/simpleperf/app_api/
*
- * @hide
*/
@SuppressWarnings({"IOStreamConstructor", "CatchMayIgnoreException",
"IfStatementMissingBreakInLoop", "ResultOfMethodCallIgnored", "StringConcatenationInLoop",
diff --git a/benchmark/benchmark-common/src/main/java/androidx/benchmark/simpleperf/RecordOptions.java b/benchmark/benchmark-common/src/main/java/androidx/benchmark/simpleperf/RecordOptions.java
index 239cce7..4a23dba 100644
--- a/benchmark/benchmark-common/src/main/java/androidx/benchmark/simpleperf/RecordOptions.java
+++ b/benchmark/benchmark-common/src/main/java/androidx/benchmark/simpleperf/RecordOptions.java
@@ -49,7 +49,6 @@
* NOTE: copied from
* https://cs.android.com/android/platform/superproject/+/master:system/extras/simpleperf/app_api/
*
- * @hide
*/
@SuppressWarnings("StringConcatenationInLoop")
@RequiresApi(28)
diff --git a/benchmark/benchmark-common/src/main/java/perfetto/protos/package-info.java b/benchmark/benchmark-common/src/main/java/perfetto/protos/package-info.java
index fd5614d..117cd14 100644
--- a/benchmark/benchmark-common/src/main/java/perfetto/protos/package-info.java
+++ b/benchmark/benchmark-common/src/main/java/perfetto/protos/package-info.java
@@ -19,8 +19,6 @@
*
* Note: other attempts to use these protos in a benchmark process may clash with our
* definitions. If this becomes an issue, we can move ours to a separate, internal package.
- *
- * @hide
*/
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
package perfetto.protos;
