Merge "Enable profileable for all benchmarks, and benchmark tests" into androidx-master-dev
diff --git a/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml b/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
index b89cf16..5f8aea8 100644
--- a/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
+++ b/ads/ads-identifier-benchmark/src/androidTest/AndroidManifest.xml
@@ -24,5 +24,8 @@
android:name=".AdsIdentifierBenchmarkApplication"
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
</application>
</manifest>
diff --git a/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml b/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml
index 1302397..1c5fab4 100644
--- a/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml
+++ b/appcompat/appcompat-benchmark/src/androidTest/AndroidManifest.xml
@@ -23,6 +23,9 @@
<application
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
<activity android:name="androidx.appcompat.app.AppCompatActivity"
android:theme="@style/Theme.AppCompat"/>
</application>
diff --git a/benchmark/benchmark/src/androidTest/AndroidManifest.xml b/benchmark/benchmark/src/androidTest/AndroidManifest.xml
index 82470db..b20d8c1 100644
--- a/benchmark/benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/benchmark/src/androidTest/AndroidManifest.xml
@@ -23,5 +23,8 @@
<application
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
</application>
</manifest>
diff --git a/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml b/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml
index 6434fda..3362f60 100644
--- a/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/integration-tests/startup-benchmark/src/androidTest/AndroidManifest.xml
@@ -19,9 +19,12 @@
xmlns:tools="http://schemas.android.com/tools"
package="androidx.benchmark.integration.startup.benchmark.test">
<application
- android:name="androidx.benchmark.integration.startup.benchmark.ArgumentInjectingApplication"
- android:debuggable="false"
- tools:ignore="HardcodedDebugMode"
- tools:replace="android:debuggable" />
- />
+ android:name="androidx.benchmark.integration.startup.benchmark.ArgumentInjectingApplication"
+ android:debuggable="false"
+ tools:ignore="HardcodedDebugMode"
+ tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable shell="true"/>
+ </application>
</manifest>
diff --git a/collection/collection-benchmark/src/androidTest/AndroidManifest.xml b/collection/collection-benchmark/src/androidTest/AndroidManifest.xml
index 0e6ce1e..1664e8d 100644
--- a/collection/collection-benchmark/src/androidTest/AndroidManifest.xml
+++ b/collection/collection-benchmark/src/androidTest/AndroidManifest.xml
@@ -23,5 +23,8 @@
<application
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
</application>
</manifest>
diff --git a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml
index e48051b..2759840 100644
--- a/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml
+++ b/compose/compose-runtime/compose-runtime-benchmark/src/androidTest/AndroidManifest.xml
@@ -26,7 +26,11 @@
android:requestLegacyExternalStorage="true"
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
+
<activity
android:name=".ComposeActivity"/>
</application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/navigation/benchmark/src/androidTest/AndroidManifest.xml b/navigation/benchmark/src/androidTest/AndroidManifest.xml
index 03cb61f..358a851 100644
--- a/navigation/benchmark/src/androidTest/AndroidManifest.xml
+++ b/navigation/benchmark/src/androidTest/AndroidManifest.xml
@@ -23,5 +23,8 @@
<application
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
</application>
</manifest>
diff --git a/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml b/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml
index 96e0fb7..8653650 100644
--- a/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml
+++ b/recyclerview/recyclerview-benchmark/src/androidTest/AndroidManifest.xml
@@ -23,6 +23,9 @@
<application
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
<activity
android:name=".RecyclerViewActivity"
android:theme="@style/BenchmarkTheme"/>
diff --git a/room/benchmark/src/androidTest/AndroidManifest.xml b/room/benchmark/src/androidTest/AndroidManifest.xml
index aeadd7c..23bc3af 100644
--- a/room/benchmark/src/androidTest/AndroidManifest.xml
+++ b/room/benchmark/src/androidTest/AndroidManifest.xml
@@ -23,5 +23,8 @@
<application
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
</application>
</manifest>
diff --git a/slices/benchmark/src/androidTest/AndroidManifest.xml b/slices/benchmark/src/androidTest/AndroidManifest.xml
index 5fd3108..8e2298b 100644
--- a/slices/benchmark/src/androidTest/AndroidManifest.xml
+++ b/slices/benchmark/src/androidTest/AndroidManifest.xml
@@ -23,5 +23,8 @@
<application
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
</application>
</manifest>
diff --git a/ui/integration-tests/benchmark/src/androidTest/AndroidManifest.xml b/ui/integration-tests/benchmark/src/androidTest/AndroidManifest.xml
index a7345d6..1983f55 100644
--- a/ui/integration-tests/benchmark/src/androidTest/AndroidManifest.xml
+++ b/ui/integration-tests/benchmark/src/androidTest/AndroidManifest.xml
@@ -23,7 +23,11 @@
~ requestLegacyExternalStorage to enable legacy JSON reporting when targeting Q
-->
<application
- android:requestLegacyExternalStorage="true"
- android:debuggable="false"
- tools:replace="android:debuggable" />
+ android:requestLegacyExternalStorage="true"
+ android:debuggable="false"
+ tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
+ </application>
</manifest>
diff --git a/work/workmanager-benchmark/src/androidTest/AndroidManifest.xml b/work/workmanager-benchmark/src/androidTest/AndroidManifest.xml
index 9ad6fef..f48b579 100644
--- a/work/workmanager-benchmark/src/androidTest/AndroidManifest.xml
+++ b/work/workmanager-benchmark/src/androidTest/AndroidManifest.xml
@@ -22,5 +22,8 @@
<application
android:debuggable="false"
tools:replace="android:debuggable">
+ <!-- enable profileableByShell for non-intrusive profiling tools -->
+ <!--suppress AndroidElementNotAllowed -->
+ <profileable android:shell="true"/>
</application>
</manifest>
