From 715570dac347a6cb42c775e1fde7c92adee30a55 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Thu, 7 Sep 2023 15:36:29 -0400 Subject: [PATCH 1/8] Update kotlin and AGP then sync lockfiles --- .../scenario_app/android/app/gradle.lockfile | 44 ++-- testing/scenario_app/android/build.gradle | 13 +- .../android/buildscript-gradle.lockfile | 203 +++++++++--------- 3 files changed, 135 insertions(+), 125 deletions(-) diff --git a/testing/scenario_app/android/app/gradle.lockfile b/testing/scenario_app/android/app/gradle.lockfile index 630350a3efe1b..e083af965d3fb 100644 --- a/testing/scenario_app/android/app/gradle.lockfile +++ b/testing/scenario_app/android/app/gradle.lockfile @@ -125,7 +125,7 @@ jline:jline:2.14.6=lintClassPath junit:junit:4.12=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath junit:junit:4.13.1=lintClassPath net.java.dev.jna:jna-platform:5.6.0=lintClassPath -net.java.dev.jna:jna:5.6.0=lintClassPath +net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath net.sf.jopt-simple:jopt-simple:4.9=lintClassPath net.sf.kxml:kxml2:2.3.0=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath,lintClassPath org.apache.ant:ant-antlr:1.10.9=lintClassPath @@ -168,29 +168,27 @@ org.glassfish.jaxb:txw2:2.3.2=lintClassPath org.hamcrest:hamcrest-core:1.3=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath,lintClassPath org.hamcrest:hamcrest-integration:1.3=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath org.hamcrest:hamcrest-library:1.3=androidTestImplementationDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestImplementationDependenciesMetadata,debugAndroidTestRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt -org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt -org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt -org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt +org.jacoco:org.jacoco.agent:0.8.8=androidJacocoAnt +org.jacoco:org.jacoco.ant:0.8.8=androidJacocoAnt +org.jacoco:org.jacoco.core:0.8.8=androidJacocoAnt +org.jacoco:org.jacoco.report:0.8.8=androidJacocoAnt org.jetbrains.intellij.deps:trove4j:1.0.20181211=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.30=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.30=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.5.30=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.10=kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath -org.jetbrains.kotlin:kotlin-reflect:1.5.30=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-script-runtime:1.5.30=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21=androidTestImplementationDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30=apiDependenciesMetadata,debugApiDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.4.21=androidTestImplementationDependenciesMetadata,debugAndroidTestImplementationDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath -org.jetbrains.kotlin:kotlin-stdlib:1.5.30=apiDependenciesMetadata,debugApiDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.6.10=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath @@ -203,12 +201,16 @@ org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath org.junit:junit-bom:5.7.0=lintClassPath org.jvnet.staxex:stax-ex:1.8.1=lintClassPath org.opentest4j:opentest4j:1.2.0=lintClassPath -org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath -org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath -org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath +org.ow2.asm:asm-analysis:7.0=lintClassPath +org.ow2.asm:asm-analysis:9.2=androidJacocoAnt +org.ow2.asm:asm-commons:7.0=lintClassPath +org.ow2.asm:asm-commons:9.2=androidJacocoAnt +org.ow2.asm:asm-tree:7.0=lintClassPath +org.ow2.asm:asm-tree:9.2=androidJacocoAnt org.ow2.asm:asm-util:7.0=lintClassPath -org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath +org.ow2.asm:asm:7.0=lintClassPath +org.ow2.asm:asm:9.2=androidJacocoAnt org.testng:testng:7.3.0=lintClassPath xerces:xercesImpl:2.12.0=lintClassPath xml-apis:xml-apis:1.4.01=lintClassPath -empty=androidApis,androidJdkImage,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugReverseMetadataValues,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseReverseMetadataValues,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata +empty=androidApis,androidJdkImage,androidTestApiDependenciesMetadata,androidTestCompileOnlyDependenciesMetadata,androidTestDebugApiDependenciesMetadata,androidTestDebugCompileOnlyDependenciesMetadata,androidTestDebugImplementationDependenciesMetadata,androidTestDebugIntransitiveDependenciesMetadata,androidTestDebugRuntimeOnlyDependenciesMetadata,androidTestIntransitiveDependenciesMetadata,androidTestReleaseApiDependenciesMetadata,androidTestReleaseCompileOnlyDependenciesMetadata,androidTestReleaseImplementationDependenciesMetadata,androidTestReleaseIntransitiveDependenciesMetadata,androidTestReleaseRuntimeOnlyDependenciesMetadata,androidTestRuntimeOnlyDependenciesMetadata,androidTestUtil,compileOnlyDependenciesMetadata,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestApiDependenciesMetadata,debugAndroidTestCompileOnlyDependenciesMetadata,debugAndroidTestIntransitiveDependenciesMetadata,debugAndroidTestRuntimeOnlyDependenciesMetadata,debugAnnotationProcessorClasspath,debugCompileOnly,debugCompileOnlyDependenciesMetadata,debugIntransitiveDependenciesMetadata,debugReverseMetadataValues,debugRuntimeOnlyDependenciesMetadata,debugUnitTestAnnotationProcessorClasspath,debugUnitTestApiDependenciesMetadata,debugUnitTestCompileOnlyDependenciesMetadata,debugUnitTestImplementationDependenciesMetadata,debugUnitTestIntransitiveDependenciesMetadata,debugUnitTestRuntimeOnlyDependenciesMetadata,debugWearBundling,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinCompilerPluginClasspathDebug,kotlinCompilerPluginClasspathDebugAndroidTest,kotlinCompilerPluginClasspathDebugUnitTest,kotlinCompilerPluginClasspathRelease,kotlinCompilerPluginClasspathReleaseUnitTest,kotlinNativeCompilerPluginClasspath,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseCompileOnly,releaseCompileOnlyDependenciesMetadata,releaseIntransitiveDependenciesMetadata,releaseReverseMetadataValues,releaseRuntimeOnlyDependenciesMetadata,releaseUnitTestAnnotationProcessorClasspath,releaseUnitTestApiDependenciesMetadata,releaseUnitTestCompileOnlyDependenciesMetadata,releaseUnitTestImplementationDependenciesMetadata,releaseUnitTestIntransitiveDependenciesMetadata,releaseUnitTestRuntimeOnlyDependenciesMetadata,releaseWearBundling,runtimeOnlyDependenciesMetadata,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testDebugApiDependenciesMetadata,testDebugCompileOnlyDependenciesMetadata,testDebugImplementationDependenciesMetadata,testDebugIntransitiveDependenciesMetadata,testDebugRuntimeOnlyDependenciesMetadata,testFixturesApiDependenciesMetadata,testFixturesCompileOnlyDependenciesMetadata,testFixturesDebugApiDependenciesMetadata,testFixturesDebugCompileOnlyDependenciesMetadata,testFixturesDebugImplementationDependenciesMetadata,testFixturesDebugIntransitiveDependenciesMetadata,testFixturesDebugRuntimeOnlyDependenciesMetadata,testFixturesImplementationDependenciesMetadata,testFixturesIntransitiveDependenciesMetadata,testFixturesReleaseApiDependenciesMetadata,testFixturesReleaseCompileOnlyDependenciesMetadata,testFixturesReleaseImplementationDependenciesMetadata,testFixturesReleaseIntransitiveDependenciesMetadata,testFixturesReleaseRuntimeOnlyDependenciesMetadata,testFixturesRuntimeOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testIntransitiveDependenciesMetadata,testReleaseApiDependenciesMetadata,testReleaseCompileOnlyDependenciesMetadata,testReleaseImplementationDependenciesMetadata,testReleaseIntransitiveDependenciesMetadata,testReleaseRuntimeOnlyDependenciesMetadata,testRuntimeOnlyDependenciesMetadata diff --git a/testing/scenario_app/android/build.gradle b/testing/scenario_app/android/build.gradle index 007f63430020b..165461c763928 100644 --- a/testing/scenario_app/android/build.gradle +++ b/testing/scenario_app/android/build.gradle @@ -6,11 +6,16 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' classpath 'com.facebook.testing.screenshot:plugin:0.12.0' - // leakcanary uses Kotlin. This app does not, but the plugin is - // needed to specify language version options. - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30' + // leakcanary uses Kotlin. This app does not, but the plugin is + // needed to specify language version options. + // Gradle 8.0 requires minimum kotlin 1.6.10 + // https://docs.gradle.org/current/userguide/upgrading_version_7.html#legacy_incrementaltaskinputs_api + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10' + // Requries Minimum AGP 7.3. + // https://docs.gradle.org/current/userguide/upgrading_version_7.html#legacy_incrementaltaskinputs_api + classpath 'com.android.tools.build:gradle:7.4.2' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/testing/scenario_app/android/buildscript-gradle.lockfile b/testing/scenario_app/android/buildscript-gradle.lockfile index 8a0282f655ecd..dc10f2efd340e 100644 --- a/testing/scenario_app/android/buildscript-gradle.lockfile +++ b/testing/scenario_app/android/buildscript-gradle.lockfile @@ -1,146 +1,149 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -androidx.databinding:databinding-common:7.0.0=classpath -androidx.databinding:databinding-compiler-common:7.0.0=classpath -com.android.databinding:baseLibrary:7.0.0=classpath -com.android.tools.analytics-library:crash:30.0.0=classpath -com.android.tools.analytics-library:protos:30.0.0=classpath -com.android.tools.analytics-library:shared:30.0.0=classpath -com.android.tools.analytics-library:tracker:30.0.0=classpath -com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath -com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath -com.android.tools.build:aapt2-proto:7.0.0-7396180=classpath -com.android.tools.build:aaptcompiler:7.0.0=classpath -com.android.tools.build:apksig:7.0.0=classpath -com.android.tools.build:apkzlib:7.0.0=classpath -com.android.tools.build:builder-model:7.0.0=classpath -com.android.tools.build:builder-test-api:7.0.0=classpath -com.android.tools.build:builder:7.0.0=classpath -com.android.tools.build:bundletool:1.6.0=classpath -com.android.tools.build:gradle-api:7.0.0=classpath -com.android.tools.build:gradle:7.0.0=classpath -com.android.tools.build:manifest-merger:30.0.0=classpath +androidx.databinding:databinding-common:7.4.2=classpath +androidx.databinding:databinding-compiler-common:7.4.2=classpath +com.android.databinding:baseLibrary:7.4.2=classpath +com.android.tools.analytics-library:crash:30.4.2=classpath +com.android.tools.analytics-library:protos:30.4.2=classpath +com.android.tools.analytics-library:shared:30.4.2=classpath +com.android.tools.analytics-library:tracker:30.4.2=classpath +com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath +com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath +com.android.tools.build:aapt2-proto:7.4.2-8841542=classpath +com.android.tools.build:aaptcompiler:7.4.2=classpath +com.android.tools.build:apksig:7.4.2=classpath +com.android.tools.build:apkzlib:7.4.2=classpath +com.android.tools.build:builder-model:7.4.2=classpath +com.android.tools.build:builder-test-api:7.4.2=classpath +com.android.tools.build:builder:7.4.2=classpath +com.android.tools.build:bundletool:1.11.4=classpath +com.android.tools.build:gradle-api:7.4.2=classpath +com.android.tools.build:gradle-settings-api:7.4.2=classpath +com.android.tools.build:gradle:7.4.2=classpath +com.android.tools.build:manifest-merger:30.4.2=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.0.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.0.0=classpath -com.android.tools.lint:lint-model:30.0.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.0.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.0=classpath -com.android.tools:annotations:30.0.0=classpath -com.android.tools:common:30.0.0=classpath -com.android.tools:dvlib:30.0.0=classpath -com.android.tools:repository:30.0.0=classpath -com.android.tools:sdk-common:30.0.0=classpath -com.android.tools:sdklib:30.0.0=classpath -com.android:signflinger:7.0.0=classpath -com.android:zipflinger:7.0.0=classpath +com.android.tools.ddms:ddmlib:30.4.2=classpath +com.android.tools.layoutlib:layoutlib-api:30.4.2=classpath +com.android.tools.lint:lint-model:30.4.2=classpath +com.android.tools.lint:lint-typedef-remover:30.4.2=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2=classpath +com.android.tools.utp:android-device-provider-gradle-proto:30.4.2=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2=classpath +com.android.tools:annotations:30.4.2=classpath +com.android.tools:common:30.4.2=classpath +com.android.tools:dvlib:30.4.2=classpath +com.android.tools:repository:30.4.2=classpath +com.android.tools:sdk-common:30.4.2=classpath +com.android.tools:sdklib:30.4.2=classpath +com.android:signflinger:7.4.2=classpath +com.android:zipflinger:7.4.2=classpath com.facebook.testing.screenshot:plugin:0.12.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath -com.google.api.grpc:proto-google-common-protos:1.12.0=classpath +com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath -com.google.code.gson:gson:2.8.6=classpath +com.google.code.gson:gson:2.8.9=classpath com.google.crypto.tink:tink:1.3.0-rc2=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.3.4=classpath +com.google.errorprone:error_prone_annotations:2.4.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath com.google.guava:guava:30.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.10.0=classpath -com.google.protobuf:protobuf-java:3.10.0=classpath -com.google.testing.platform:core-proto:0.0.8-alpha04=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.17.2=classpath +com.google.protobuf:protobuf-java:3.17.2=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath com.sun.activation:javax.activation:1.2.0=classpath com.sun.istack:istack-commons-runtime:3.0.8=classpath com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath -commons-codec:commons-codec:1.10=classpath +commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.21.1=classpath -io.grpc:grpc-context:1.21.1=classpath -io.grpc:grpc-core:1.21.1=classpath -io.grpc:grpc-netty:1.21.1=classpath -io.grpc:grpc-protobuf-lite:1.21.1=classpath -io.grpc:grpc-protobuf:1.21.1=classpath -io.grpc:grpc-stub:1.21.1=classpath -io.netty:netty-buffer:4.1.34.Final=classpath -io.netty:netty-codec-http2:4.1.34.Final=classpath -io.netty:netty-codec-http:4.1.34.Final=classpath -io.netty:netty-codec-socks:4.1.34.Final=classpath -io.netty:netty-codec:4.1.34.Final=classpath -io.netty:netty-common:4.1.34.Final=classpath -io.netty:netty-handler-proxy:4.1.34.Final=classpath -io.netty:netty-handler:4.1.34.Final=classpath -io.netty:netty-resolver:4.1.34.Final=classpath -io.netty:netty-transport:4.1.34.Final=classpath -io.opencensus:opencensus-api:0.21.0=classpath -io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath +io.grpc:grpc-api:1.39.0=classpath +io.grpc:grpc-context:1.39.0=classpath +io.grpc:grpc-core:1.39.0=classpath +io.grpc:grpc-netty:1.39.0=classpath +io.grpc:grpc-protobuf-lite:1.39.0=classpath +io.grpc:grpc-protobuf:1.39.0=classpath +io.grpc:grpc-stub:1.39.0=classpath +io.netty:netty-buffer:4.1.52.Final=classpath +io.netty:netty-codec-http2:4.1.52.Final=classpath +io.netty:netty-codec-http:4.1.52.Final=classpath +io.netty:netty-codec-socks:4.1.52.Final=classpath +io.netty:netty-codec:4.1.52.Final=classpath +io.netty:netty-common:4.1.52.Final=classpath +io.netty:netty-handler-proxy:4.1.52.Final=classpath +io.netty:netty-handler:4.1.52.Final=classpath +io.netty:netty-resolver:4.1.52.Final=classpath +io.netty:netty-transport:4.1.52.Final=classpath +io.perfmark:perfmark-api:0.23.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath +javax.annotation:javax.annotation-api:1.3.2=classpath javax.inject:javax.inject:1=classpath net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.antlr:antlr4:4.5.3=classpath org.apache.commons:commons-compress:1.20=classpath -org.apache.httpcomponents:httpclient:4.5.6=classpath -org.apache.httpcomponents:httpcore:4.4.10=classpath +org.apache.httpcomponents:httpclient:4.5.13=classpath +org.apache.httpcomponents:httpcore:4.4.13=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath -org.bouncycastle:bcpkix-jdk15on:1.56=classpath -org.bouncycastle:bcprov-jdk15on:1.56=classpath +org.bitbucket.b_c:jose4j:0.7.0=classpath +org.bouncycastle:bcpkix-jdk15on:1.67=classpath +org.bouncycastle:bcprov-jdk15on:1.67=classpath org.checkerframework:checker-qual:3.5.0=classpath -org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath +org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath org.jdom:jdom2:2.0.6=classpath -org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath -org.jetbrains.kotlin:kotlin-android-extensions:1.5.30=classpath -org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.30=classpath -org.jetbrains.kotlin:kotlin-build-common:1.5.30=classpath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.30=classpath -org.jetbrains.kotlin:kotlin-compiler-runner:1.5.30=classpath -org.jetbrains.kotlin:kotlin-daemon-client:1.5.30=classpath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.30=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.30=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.30=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30=classpath -org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.30=classpath -org.jetbrains.kotlin:kotlin-native-utils:1.5.30=classpath -org.jetbrains.kotlin:kotlin-project-model:1.5.30=classpath -org.jetbrains.kotlin:kotlin-reflect:1.4.32=classpath -org.jetbrains.kotlin:kotlin-scripting-common:1.5.30=classpath -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.30=classpath -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.30=classpath -org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.30=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.4.32=classpath -org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.30=classpath -org.jetbrains.kotlin:kotlin-util-io:1.5.30=classpath -org.jetbrains.kotlin:kotlin-util-klib:1.5.30=classpath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath +org.jetbrains.kotlin:kotlin-android-extensions:1.6.10=classpath +org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.10=classpath +org.jetbrains.kotlin:kotlin-build-common:1.6.10=classpath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.10=classpath +org.jetbrains.kotlin:kotlin-compiler-runner:1.6.10=classpath +org.jetbrains.kotlin:kotlin-daemon-client:1.6.10=classpath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10=classpath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.10=classpath +org.jetbrains.kotlin:kotlin-native-utils:1.6.10=classpath +org.jetbrains.kotlin:kotlin-project-model:1.6.10=classpath +org.jetbrains.kotlin:kotlin-reflect:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-common:1.6.10=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.10=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.10=classpath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath +org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.10=classpath +org.jetbrains.kotlin:kotlin-util-io:1.6.10=classpath +org.jetbrains.kotlin:kotlin-util-klib:1.6.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath org.jetbrains:annotations:13.0=classpath org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:7.0=classpath -org.ow2.asm:asm-commons:7.0=classpath -org.ow2.asm:asm-tree:7.0=classpath -org.ow2.asm:asm-util:7.0=classpath -org.ow2.asm:asm:7.0=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath +org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath xml-apis:xml-apis:1.4.01=classpath From cede92d1ffcd69adbc8d06c98b66dbe0cb4ad582 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Thu, 7 Sep 2023 16:08:48 -0400 Subject: [PATCH 2/8] Add backup config xml definitions to support android api 31+ --- .../android/app/src/main/AndroidManifest.xml | 3 ++- .../android/app/src/main/extraction_config.xml | 11 +++++++++++ .../app/src/main/extraction_config_11_and_below.xml | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 testing/scenario_app/android/app/src/main/extraction_config.xml create mode 100644 testing/scenario_app/android/app/src/main/extraction_config_11_and_below.xml diff --git a/testing/scenario_app/android/app/src/main/AndroidManifest.xml b/testing/scenario_app/android/app/src/main/AndroidManifest.xml index 96ec901014b28..32549b48f042b 100644 --- a/testing/scenario_app/android/app/src/main/AndroidManifest.xml +++ b/testing/scenario_app/android/app/src/main/AndroidManifest.xml @@ -4,7 +4,8 @@ diff --git a/testing/scenario_app/android/app/src/main/extraction_config.xml b/testing/scenario_app/android/app/src/main/extraction_config.xml new file mode 100644 index 0000000000000..33eafdeccfe3f --- /dev/null +++ b/testing/scenario_app/android/app/src/main/extraction_config.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/testing/scenario_app/android/app/src/main/extraction_config_11_and_below.xml b/testing/scenario_app/android/app/src/main/extraction_config_11_and_below.xml new file mode 100644 index 0000000000000..b2a10c7e4dfd9 --- /dev/null +++ b/testing/scenario_app/android/app/src/main/extraction_config_11_and_below.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From e1e215d27a53c889a883d06e663571204186bfc8 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Fri, 8 Sep 2023 10:19:38 -0400 Subject: [PATCH 3/8] Move backup config xml files to res directory --- .../android/app/src/main/{ => res/xml}/extraction_config.xml | 0 .../app/src/main/{ => res/xml}/extraction_config_11_and_below.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename testing/scenario_app/android/app/src/main/{ => res/xml}/extraction_config.xml (100%) rename testing/scenario_app/android/app/src/main/{ => res/xml}/extraction_config_11_and_below.xml (100%) diff --git a/testing/scenario_app/android/app/src/main/extraction_config.xml b/testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml similarity index 100% rename from testing/scenario_app/android/app/src/main/extraction_config.xml rename to testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml diff --git a/testing/scenario_app/android/app/src/main/extraction_config_11_and_below.xml b/testing/scenario_app/android/app/src/main/res/xml/extraction_config_11_and_below.xml similarity index 100% rename from testing/scenario_app/android/app/src/main/extraction_config_11_and_below.xml rename to testing/scenario_app/android/app/src/main/res/xml/extraction_config_11_and_below.xml From 6dfa96967ee6d985a2717ead1c621be4c5ba5e19 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Fri, 8 Sep 2023 10:45:24 -0400 Subject: [PATCH 4/8] Correct xml format errors and exclude all domains of info --- .../app/src/main/res/xml/extraction_config.xml | 17 ++++++++++++----- .../res/xml/extraction_config_11_and_below.xml | 7 +++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml b/testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml index 33eafdeccfe3f..b6a6dd2c19fa3 100644 --- a/testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml +++ b/testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml @@ -1,11 +1,18 @@ + - - - + + + + + + - - + + + + + \ No newline at end of file diff --git a/testing/scenario_app/android/app/src/main/res/xml/extraction_config_11_and_below.xml b/testing/scenario_app/android/app/src/main/res/xml/extraction_config_11_and_below.xml index b2a10c7e4dfd9..ff293d0205569 100644 --- a/testing/scenario_app/android/app/src/main/res/xml/extraction_config_11_and_below.xml +++ b/testing/scenario_app/android/app/src/main/res/xml/extraction_config_11_and_below.xml @@ -1,5 +1,8 @@ - - + + + + + \ No newline at end of file From 58fe977b8f661f512a14f9b2d0e4872454efbb3d Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Fri, 8 Sep 2023 11:10:18 -0400 Subject: [PATCH 5/8] Correct xml format errors try 2 --- .../android/app/src/main/AndroidManifest.xml | 6 +++--- .../src/main/res/xml/data_extraction_rules.xml | 18 ++++++++++++++++++ .../app/src/main/res/xml/extraction_config.xml | 18 ------------------ 3 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 testing/scenario_app/android/app/src/main/res/xml/data_extraction_rules.xml delete mode 100644 testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml diff --git a/testing/scenario_app/android/app/src/main/AndroidManifest.xml b/testing/scenario_app/android/app/src/main/AndroidManifest.xml index 32549b48f042b..4046ad3a98c34 100644 --- a/testing/scenario_app/android/app/src/main/AndroidManifest.xml +++ b/testing/scenario_app/android/app/src/main/AndroidManifest.xml @@ -4,11 +4,11 @@ + android:theme="@style/AppTheme" + android:dataExtractionRules="@xml/data_extraction_rules" + android:fullBackupContent="@xml/extraction_config_11_and_below"> + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml b/testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml deleted file mode 100644 index b6a6dd2c19fa3..0000000000000 --- a/testing/scenario_app/android/app/src/main/res/xml/extraction_config.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file From 992e0f5f27a70393cff91f08aa4ca8121eb348e2 Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Fri, 8 Sep 2023 12:02:39 -0400 Subject: [PATCH 6/8] Ignore unused attribute for extraction rules --- testing/scenario_app/android/app/src/main/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testing/scenario_app/android/app/src/main/AndroidManifest.xml b/testing/scenario_app/android/app/src/main/AndroidManifest.xml index 4046ad3a98c34..e125978054d8d 100644 --- a/testing/scenario_app/android/app/src/main/AndroidManifest.xml +++ b/testing/scenario_app/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ + android:fullBackupContent="@xml/extraction_config_11_and_below" + tools:ignore="UnusedAttribute"> Date: Fri, 8 Sep 2023 15:34:47 -0400 Subject: [PATCH 7/8] Create cursor and close in finally block --- .../main/java/dev/flutter/scenarios/TestActivity.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java index bc4dd41e582b5..39bdf4f5d8fe7 100644 --- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java +++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java @@ -7,6 +7,7 @@ import android.Manifest; import android.content.Context; import android.content.Intent; +import android.content.res.AssetFileDescriptor; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -113,14 +114,19 @@ protected void writeTimelineData(@Nullable Uri logFile) { channel.send( null, (ByteBuffer reply) -> { + AssetFileDescriptor afd = null; try { - final FileDescriptor fd = - getContentResolver().openAssetFileDescriptor(logFile, "w").getFileDescriptor(); + afd = getContentResolver().openAssetFileDescriptor(logFile, "w"); + final FileDescriptor fd = afd.getFileDescriptor(); final FileOutputStream outputStream = new FileOutputStream(fd); outputStream.write(reply.array()); outputStream.close(); } catch (IOException ex) { Log.e(TAG, "Could not write timeline file", ex); + } finally { + if (afd != null) { + afd.close(); + } } finish(); }); From 8ea3fbb156489bcadcff054caca133cb07823c1d Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Tue, 12 Sep 2023 14:53:00 -0400 Subject: [PATCH 8/8] Catch io exception --- .../src/main/java/dev/flutter/scenarios/TestActivity.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java index 39bdf4f5d8fe7..1aafd660b0825 100644 --- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java +++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java @@ -124,8 +124,12 @@ protected void writeTimelineData(@Nullable Uri logFile) { } catch (IOException ex) { Log.e(TAG, "Could not write timeline file", ex); } finally { - if (afd != null) { - afd.close(); + try { + if (afd != null) { + afd.close(); + } + } catch (IOException e) { + Log.w(TAG, "Could not close", e); } } finish();