[pull] androidx-main from androidx:androidx-main

appfunctions/appfunctions/src/main/AndroidManifest.xml

@@ -22,8 +22,5 @@
         <property
             android:name="android.app.appfunctions.schema"
             android:value="app_functions_schema.xsd" />
-        <receiver
-            android:name="androidx.appfunctions.internal.AppFunctionCallerVerificationReceiver"
-            android:exported="false" />
     </application>
 </manifest>

appfunctions/integration-tests/agentapp/src/main/AndroidManifest.xml

@@ -24,6 +24,10 @@
 
     <application
         android:name=".TestApplication"
-        android:supportsRtl="true" />
+        android:supportsRtl="true" >
+        <receiver
+            android:name="androidx.appfunctions.internal.AppFunctionCallerVerificationReceiver"
+            android:exported="false" />
+    </application>
 
 </manifest>

appfunctions/integration-tests/multi-modules-testapp/app/src/main/AndroidManifest.xml

@@ -105,5 +105,8 @@
                 <action android:name="androidx.appfunctions.integration.testapp.ACTION_SET_STATE" />
             </intent-filter>
         </receiver>
+        <receiver
+            android:name="androidx.appfunctions.internal.AppFunctionCallerVerificationReceiver"
+            android:exported="false" />
     </application>
 </manifest>

benchmark/benchmark-macro-junit4/build.gradle

@@ -80,7 +80,6 @@ androidx {
     type = SoftwareType.PUBLISHED_LIBRARY
     inceptionYear = "2020"
     description = "Android Benchmark - Macrobenchmark JUnit4"
-    legacyDisableKotlinStrictApiMode = true
     deviceTests {
         targetAppProject = project(":benchmark:integration-tests:macrobenchmark-target")
         targetAppVariant = "release"

benchmark/benchmark-macro-junit4/src/main/java/androidx/benchmark/macro/junit4/BaselineProfileRule.kt

@@ -45,7 +45,7 @@ import org.junit.runners.model.Statement
  * @sample androidx.benchmark.samples.baselineProfileRuleLibrarySample
  */
 @RequiresApi(28)
-class BaselineProfileRule : TestRule {
+public class BaselineProfileRule : TestRule {
     private lateinit var currentDescription: Description
 
     override fun apply(base: Statement, description: Description): Statement =
@@ -81,7 +81,7 @@ class BaselineProfileRule : TestRule {
      * @param [profileBlock] defines the critical user journey.
      */
     @JvmOverloads
-    fun collect(
+    public fun collect(
         packageName: String,
         maxIterations: Int = 15,
         stableIterations: Int = 3,

benchmark/benchmark-macro-junit4/src/main/java/androidx/benchmark/macro/junit4/InstrumentationResultsRunListener.kt

@@ -31,7 +31,7 @@ import org.junit.runner.Result
  */
 @Suppress("unused", "RestrictedApiAndroidX") // referenced by inst arg at runtime
 @RestrictTo(RestrictTo.Scope.LIBRARY)
-class InstrumentationResultsRunListener : InstrumentationRunListener() {
+public class InstrumentationResultsRunListener : InstrumentationRunListener() {
     override fun instrumentationRunFinished(
         streamResult: PrintStream?,
         resultBundle: Bundle,

benchmark/benchmark-macro-junit4/src/main/java/androidx/benchmark/macro/junit4/MacrobenchmarkRule.kt

@@ -39,7 +39,7 @@ import org.junit.runners.model.Statement
  *
  * @sample androidx.benchmark.samples.macrobenchmarkRuleSample
  */
-class MacrobenchmarkRule : TestRule {
+public class MacrobenchmarkRule : TestRule {
     private lateinit var currentDescription: Description
 
     /**
@@ -75,7 +75,7 @@ class MacrobenchmarkRule : TestRule {
      * @param measureBlock The block performing app actions to benchmark each iteration.
      */
     @JvmOverloads
-    fun measureRepeated(
+    public fun measureRepeated(
         packageName: String,
         metrics: List<Metric>,
         compilationMode: CompilationMode = CompilationMode.DEFAULT,
@@ -143,7 +143,7 @@ class MacrobenchmarkRule : TestRule {
      */
     @ExperimentalBenchmarkConfigApi
     @JvmOverloads
-    fun measureRepeated(
+    public fun measureRepeated(
         packageName: String,
         metrics: List<Metric>,
         @IntRange(from = 1) iterations: Int,
@@ -168,6 +168,10 @@ class MacrobenchmarkRule : TestRule {
         )
     }
 
+    /**
+     * @param perfettoConfig Configuration for Perfetto trace capture during each iteration. Note
+     *   that insufficient or invalid configs may result in built-in [Metric]s not working.
+     */
     @ExperimentalBenchmarkConfigApi
     @JvmOverloads
     @Deprecated(
@@ -179,11 +183,7 @@ class MacrobenchmarkRule : TestRule {
             ),
         level = DeprecationLevel.WARNING,
     )
-    /**
-     * @param perfettoConfig Configuration for Perfetto trace capture during each iteration. Note
-     *   that insufficient or invalid configs may result in built-in [Metric]s not working.
-     */
-    fun measureRepeated(
+    public fun measureRepeated(
         packageName: String,
         metrics: List<Metric>,
         @IntRange(from = 1) iterations: Int,
@@ -192,7 +192,7 @@ class MacrobenchmarkRule : TestRule {
         startupMode: StartupMode? = null,
         setupBlock: MacrobenchmarkScope.() -> Unit = {},
         measureBlock: MacrobenchmarkScope.() -> Unit,
-    ) =
+    ): Unit =
         measureRepeated(
             packageName,
             metrics,

benchmark/benchmark-macro-junit4/src/main/java/androidx/benchmark/macro/junit4/SideEffectRunListener.kt

@@ -28,7 +28,7 @@ import org.junit.runner.notification.RunListener
 /** Enables the use of side-effects that reduce the noise during a macro benchmark run. */
 @Suppress("unused") // referenced by inst arg at runtime
 @RestrictTo(RestrictTo.Scope.LIBRARY)
-class SideEffectRunListener : RunListener() {
+public class SideEffectRunListener : RunListener() {
     private val delegate: RunListenerDelegate =
         RunListenerDelegate(sideEffects = listOf(DisablePackages(), DisableDexOpt()))
 

benchmark/benchmark-macro/build.gradle

@@ -99,7 +99,6 @@ androidx {
     type = SoftwareType.PUBLISHED_LIBRARY
     inceptionYear = "2020"
     description = "Android Benchmark - Macrobenchmark"
-    legacyDisableKotlinStrictApiMode = true
     deviceTests {
         enableAlsoRunningOnPhysicalDevices = true
     }

benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfileConfig.kt

@@ -16,7 +16,7 @@
 
 package androidx.benchmark.macro
 
-class BaselineProfileConfig
+public class BaselineProfileConfig
 internal constructor(
     private val outputFilePrefix: String?,
     private val packageName: String,
@@ -32,22 +32,22 @@ internal constructor(
      * @return An optional file name prefix used when creating the output file with the contents of
      *   the human readable baseline profile. For example: `outputFilePrefix-baseline-prof.txt`
      */
-    fun getOutputFilePrefix(): String? = outputFilePrefix
+    public fun getOutputFilePrefix(): String? = outputFilePrefix
 
     /** @return The Package name of the app for which profiles are to be generated. */
-    fun getPackageName(): String = packageName
+    public fun getPackageName(): String = packageName
 
     /** @return the he critical user journey. */
-    fun getProfileBlock(): MacrobenchmarkScope.() -> Unit = profileBlock
+    public fun getProfileBlock(): MacrobenchmarkScope.() -> Unit = profileBlock
 
     /** @return the maximum number of iterations to run when collecting profiles. */
-    fun getMaxIterations(): Int = maxIterations
+    public fun getMaxIterations(): Int = maxIterations
 
     /**
      * @return the minimum number of iterations to observe as stable before assuming stability, and
      *   completing profile generation.
      */
-    fun getStableIterations(): Int = stableIterations
+    public fun getStableIterations(): Int = stableIterations
 
     /**
      * Determines whether the generated profile should be also used as a startup profile. A startup
@@ -56,16 +56,16 @@ internal constructor(
      * flows, such as main application startup pre and post login or other entry points of the app.
      * Note that methods collected in a startup profiles are also utilized for baseline profiles.
      */
-    fun isIncludeInStartupProfile(): Boolean = includeInStartupProfile
+    public fun isIncludeInStartupProfile(): Boolean = includeInStartupProfile
 
     /** @return `true` iff we enforce that the generated profile was stable */
-    fun isStrictStability(): Boolean = strictStability
+    public fun isStrictStability(): Boolean = strictStability
 
     /** @return the function used to filter individual rules / lines of the baseline profile. */
-    fun getFilterPredicate(): (String) -> Boolean = filterPredicate
+    public fun getFilterPredicate(): (String) -> Boolean = filterPredicate
 
     /** Can be used to build a [androidx.benchmark.macro.BaselineProfileConfig] instance. */
-    class Builder
+    public class Builder
     public constructor(
         private val packageName: String,
         private val profileBlock: MacrobenchmarkScope.() -> Unit,
@@ -84,7 +84,7 @@ internal constructor(
          * @return The [androidx.benchmark.macro.BaselineProfileConfig.Builder] instance for
          *   chaining.
          */
-        fun setOutputFilePrefix(outputFilePrefix: String): Builder {
+        public fun setOutputFilePrefix(outputFilePrefix: String): Builder {
             this.outputFilePrefix = outputFilePrefix
             return this
         }
@@ -95,7 +95,7 @@ internal constructor(
          * @return The [androidx.benchmark.macro.BaselineProfileConfig.Builder] instance for
          *   chaining.
          */
-        fun setMaxIterations(maxIterations: Int): Builder {
+        public fun setMaxIterations(maxIterations: Int): Builder {
             this.maxIterations = maxIterations
             return this
         }
@@ -107,7 +107,7 @@ internal constructor(
          * @return The [androidx.benchmark.macro.BaselineProfileConfig.Builder] instance for
          *   chaining.
          */
-        fun setStableIterations(stableIterations: Int): Builder {
+        public fun setStableIterations(stableIterations: Int): Builder {
             this.stableIterations = stableIterations
             return this
         }
@@ -123,7 +123,7 @@ internal constructor(
          * @return The [androidx.benchmark.macro.BaselineProfileConfig.Builder] instance for
          *   chaining.
          */
-        fun setIncludeInStartupProfile(includeInStartupProfile: Boolean): Builder {
+        public fun setIncludeInStartupProfile(includeInStartupProfile: Boolean): Builder {
             this.includeInStartupProfile = includeInStartupProfile
             return this
         }
@@ -134,7 +134,7 @@ internal constructor(
          * @return The [androidx.benchmark.macro.BaselineProfileConfig.Builder] instance for
          *   chaining.
          */
-        fun setStrictStability(strictStability: Boolean): Builder {
+        public fun setStrictStability(strictStability: Boolean): Builder {
             this.strictStability = strictStability
             return this
         }
@@ -147,13 +147,13 @@ internal constructor(
          * @return The [androidx.benchmark.macro.BaselineProfileConfig.Builder] instance for
          *   chaining.
          */
-        fun setFilterPredicate(filterPredicate: (String) -> Boolean): Builder {
+        public fun setFilterPredicate(filterPredicate: (String) -> Boolean): Builder {
             this.filterPredicate = filterPredicate
             return this
         }
 
         /** @return the [androidx.benchmark.macro.BaselineProfileConfig] instance. */
-        fun build(): BaselineProfileConfig {
+        public fun build(): BaselineProfileConfig {
             return BaselineProfileConfig(
                 outputFilePrefix = outputFilePrefix,
                 packageName = packageName,

benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfileMode.kt

@@ -20,7 +20,7 @@ package androidx.benchmark.macro
  * Choice of how the Baseline Profile in a target application should be included or ignored during
  * pre-compilation.
  */
-enum class BaselineProfileMode {
+public enum class BaselineProfileMode {
     /**
      * Require the BaselineProfile methods/classes from the target app to be pre-compiled.
      *

benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt

@@ -39,7 +39,7 @@ import java.io.File
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 @RequiresApi(28)
-fun collect(
+public fun collect(
     uniqueName: String,
     packageName: String,
     stableIterations: Int,
@@ -389,7 +389,7 @@ private data class Summary(
 /** A container for the results of collecting Baseline Profiles using the [collect] API. */
 public class BaselineProfileResult(
     /** A list of absolute file paths to the generated baseline profiles. */
-    val baselineProfiles: List<String> = emptyList(),
+    public val baselineProfiles: List<String> = emptyList(),
     /** A list of absolute file paths to the generated startup profiles. */
-    val startupProfiles: List<String> = emptyList(),
+    public val startupProfiles: List<String> = emptyList(),
 )

benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BatteryCharge.kt

@@ -20,11 +20,11 @@ import androidx.annotation.RestrictTo
 import androidx.benchmark.DeviceInfo
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
-object BatteryCharge {
+public object BatteryCharge {
 
     private const val MIN_BATTERY_PERCENT = 50
 
-    fun hasMinimumCharge(throwOnMissingMetrics: Boolean = false): Boolean {
+    public fun hasMinimumCharge(throwOnMissingMetrics: Boolean = false): Boolean {
         if (DeviceInfo.initialBatteryPercent >= MIN_BATTERY_PERCENT) {
             return true
         }