From ddfd6be1e0d8fc451aea7571fe1550ff22bef221 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 09:54:42 -0700 Subject: [PATCH 01/29] Test pointing at my fork before landing that change --- DEPS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 582a74f9ea6b5..5f3df4b5494e0 100644 --- a/DEPS +++ b/DEPS @@ -262,7 +262,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '5ced4367fee2721f6eda34802dc28b1335637c63', + 'src': 'https://github.com/gmackall/buildroot.git' + '@' + '302769cc2f56a0898ce67274ac8543c8b80e5d9a', 'src/flutter/third_party/rapidjson': Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b', @@ -719,7 +719,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:33v6' + 'version': 'version:34v2' } ], 'condition': 'download_android_deps', From e702da61382ac3a6475cd92c633c4a8db23c2ad2 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 09:56:36 -0700 Subject: [PATCH 02/29] Update test_runner build.gradle to use minsdk 19 and compilesdk 34 --- shell/platform/android/test_runner/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/platform/android/test_runner/build.gradle b/shell/platform/android/test_runner/build.gradle index 53a537f874c15..609d4810f6a4f 100644 --- a/shell/platform/android/test_runner/build.gradle +++ b/shell/platform/android/test_runner/build.gradle @@ -32,10 +32,10 @@ println "AVAILABLE PROCESSORS: $availableProcessors" println "==========================================" android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { - minSdkVersion 16 + minSdkVersion 19 } compileOptions { From af8878704ec9f06e3d6e0ecb2450e032dbcf9f7f Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 09:57:37 -0700 Subject: [PATCH 03/29] Update build.gradle --- testing/android_background_image/android/app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/android_background_image/android/app/build.gradle b/testing/android_background_image/android/app/build.gradle index c7346c23e8422..7a72a25fe99e6 100644 --- a/testing/android_background_image/android/app/build.gradle +++ b/testing/android_background_image/android/app/build.gradle @@ -16,16 +16,16 @@ android { // The others are irrelevant for a test application. disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable' } - buildToolsVersion = '33.0.0' - compileSdkVersion 33 + buildToolsVersion = '34.0.0' + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } defaultConfig { applicationId 'dev.flutter.android_background_image' - minSdkVersion 16 - targetSdkVersion 33 + minSdkVersion 19 + targetSdkVersion 34 versionCode 1 versionName '1.0' } From a7b56abec1f26276880b2b29a3ce1aa8555e78e4 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 09:58:12 -0700 Subject: [PATCH 04/29] Update build.gradle --- testing/scenario_app/android/app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle index 5f2a94523b996..2465157ed5ff4 100644 --- a/testing/scenario_app/android/app/build.gradle +++ b/testing/scenario_app/android/app/build.gradle @@ -18,16 +18,16 @@ android { // The others are irrelevant for a test application. disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered' } - buildToolsVersion = '33.0.0' - compileSdkVersion 33 + buildToolsVersion = '34.0.0' + compileSdkVersion 34 compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } defaultConfig { applicationId 'dev.flutter.scenarios' - minSdkVersion 18 - targetSdkVersion 33 + minSdkVersion 19 + targetSdkVersion 34 versionCode 1 versionName '1.0' testInstrumentationRunner 'dev.flutter.TestRunner' From c0f49558f7be5a3582405b48beee4b8dcbe7e28f Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:07:20 -0700 Subject: [PATCH 05/29] Update main.dart --- tools/android_lint/bin/main.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/android_lint/bin/main.dart b/tools/android_lint/bin/main.dart index 88cfd040e231b..d6b6191b73e98 100644 --- a/tools/android_lint/bin/main.dart +++ b/tools/android_lint/bin/main.dart @@ -73,7 +73,7 @@ Future runLint(ArgParser argParser, ArgResults argResults) async { - + '''); for (final FileSystemEntity entity in androidDir.listSync(recursive: true)) { @@ -95,7 +95,7 @@ Future runLint(ArgParser argParser, ArgResults argResults) async { final List lintArgs = [ path.join(androidSdkDir.path, 'cmdline-tools', 'latest', 'bin', 'lint'), '--project', projectXmlPath, - '--compile-sdk-version', '33', + '--compile-sdk-version', '34', '--showall', '--exitcode', // Set non-zero exit code on errors '-Wall', From 5a8a8fe22999729257ff1c68a49535cc38f61cd5 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:08:25 -0700 Subject: [PATCH 06/29] Update project.xml --- tools/android_lint/project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/android_lint/project.xml b/tools/android_lint/project.xml index c2a754adebd14..c15adb44c9008 100644 --- a/tools/android_lint/project.xml +++ b/tools/android_lint/project.xml @@ -2,7 +2,7 @@ - + From d5ea6e84a97d3d452d727f519ef6fa75f5d01aaa Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:08:55 -0700 Subject: [PATCH 07/29] Update packages.txt --- tools/android_sdk/packages.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index b257101a496af..43a2526314c4e 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -1,6 +1,6 @@ -platforms;android-33:platforms +platforms;android-34:platforms cmdline-tools;latest:cmdline-tools -build-tools;33.0.0:build-tools +build-tools;34.0.0:build-tools platform-tools:platform-tools tools:tools -ndk;22.1.7171670:ndk \ No newline at end of file +ndk;22.1.7171670:ndk From 3df6f1768b2d0fc8717f02a9d5d8e04a40a9a3bb Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:09:19 -0700 Subject: [PATCH 08/29] Update build.gradle --- tools/cipd/android_embedding_bundle/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cipd/android_embedding_bundle/build.gradle b/tools/cipd/android_embedding_bundle/build.gradle index f110332990e12..9b93d0a0afbdf 100644 --- a/tools/cipd/android_embedding_bundle/build.gradle +++ b/tools/cipd/android_embedding_bundle/build.gradle @@ -33,7 +33,7 @@ allprojects { apply plugin: "com.android.application" android { - compileSdkVersion 33 + compileSdkVersion 34 } configurations { From 17da919dba4aa0a37a20b31d27e787392d7b4fcf Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:09:47 -0700 Subject: [PATCH 09/29] Update gen_javadoc.py --- tools/javadoc/gen_javadoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index 92b49ad77118d..739de78389ea5 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -58,7 +58,7 @@ def main(): classpath = [ args.android_source_root, os.path.join( - args.third_party, 'android_tools/sdk/platforms/android-33/android.jar' + args.third_party, 'android_tools/sdk/platforms/android-34/android.jar' ), os.path.join( args.third_party, 'android_embedding_dependencies', 'lib', '*' From 8d3a65f00ea3bed7eebede08c4286bdf78977e45 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 14:48:25 -0700 Subject: [PATCH 10/29] Update DEPS --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 25b4fe28bc177..5eb7c86ff6348 100644 --- a/DEPS +++ b/DEPS @@ -87,7 +87,7 @@ vars = { 'download_dart_sdk': True, # Checkout Android dependencies only on platforms where we build for Android targets. - 'download_android_deps': 'host_os == "mac" or (host_os == "linux" and host_cpu == "x64")', + 'download_android_deps': True, # Checkout Windows dependencies only if we are building on Windows. 'download_windows_deps' : 'host_os == "win"', From 1f6123f750f8a1ad78c13dc998bcdfb8d9a19a7f Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 14:59:16 -0700 Subject: [PATCH 11/29] Update DEPS --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 5eb7c86ff6348..25b4fe28bc177 100644 --- a/DEPS +++ b/DEPS @@ -87,7 +87,7 @@ vars = { 'download_dart_sdk': True, # Checkout Android dependencies only on platforms where we build for Android targets. - 'download_android_deps': True, + 'download_android_deps': 'host_os == "mac" or (host_os == "linux" and host_cpu == "x64")', # Checkout Windows dependencies only if we are building on Windows. 'download_windows_deps' : 'host_os == "win"', From 6a8b64682b48fa401eb71ddd5401bcf8eefb42bf Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:10:05 -0700 Subject: [PATCH 12/29] Update DEPS --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 25b4fe28bc177..2107977dca398 100644 --- a/DEPS +++ b/DEPS @@ -143,7 +143,7 @@ vars = { "upstream_boringssl_gen": "https://github.com/dart-lang/boringssl_gen.git", "upstream_boringssl": "https://github.com/openssl/openssl.git", "upstream_browser_launcher": "https://github.com/dart-lang/browser_launcher.git", - "upstream_buildroot": "https://github.com/flutter/buildroot.git", + "upstream_buildroot": "https://github.com/gmackall/buildroot.git", "upstream_cli_util": "https://github.com/dart-lang/cli_util.git", "upstream_clock": "https://github.com/dart-lang/clock.git", "upstream_collection": "https://github.com/dart-lang/collection.git", From af3ce86b452327773691cc52a1e14f46eba86689 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Fri, 3 Nov 2023 12:23:07 -0700 Subject: [PATCH 13/29] Try undoing to isolate where failure is coming from --- DEPS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 2107977dca398..e3eaa94502258 100644 --- a/DEPS +++ b/DEPS @@ -143,7 +143,7 @@ vars = { "upstream_boringssl_gen": "https://github.com/dart-lang/boringssl_gen.git", "upstream_boringssl": "https://github.com/openssl/openssl.git", "upstream_browser_launcher": "https://github.com/dart-lang/browser_launcher.git", - "upstream_buildroot": "https://github.com/gmackall/buildroot.git", + "upstream_buildroot": "https://github.com/flutter/buildroot.git", "upstream_cli_util": "https://github.com/dart-lang/cli_util.git", "upstream_clock": "https://github.com/dart-lang/clock.git", "upstream_collection": "https://github.com/dart-lang/collection.git", @@ -262,7 +262,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/gmackall/buildroot.git' + '@' + '302769cc2f56a0898ce67274ac8543c8b80e5d9a', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '5ced4367fee2721f6eda34802dc28b1335637c63', 'src/flutter/third_party/rapidjson': Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b', @@ -719,7 +719,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:34v2' + 'version': 'version:33v6' } ], 'condition': 'download_android_deps', From 4c37722787a1eff0ea3cd8c5da246c1464be477b Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Mon, 6 Nov 2023 11:38:03 -0800 Subject: [PATCH 14/29] revert back --- DEPS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index e3eaa94502258..2107977dca398 100644 --- a/DEPS +++ b/DEPS @@ -143,7 +143,7 @@ vars = { "upstream_boringssl_gen": "https://github.com/dart-lang/boringssl_gen.git", "upstream_boringssl": "https://github.com/openssl/openssl.git", "upstream_browser_launcher": "https://github.com/dart-lang/browser_launcher.git", - "upstream_buildroot": "https://github.com/flutter/buildroot.git", + "upstream_buildroot": "https://github.com/gmackall/buildroot.git", "upstream_cli_util": "https://github.com/dart-lang/cli_util.git", "upstream_clock": "https://github.com/dart-lang/clock.git", "upstream_collection": "https://github.com/dart-lang/collection.git", @@ -262,7 +262,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '5ced4367fee2721f6eda34802dc28b1335637c63', + 'src': 'https://github.com/gmackall/buildroot.git' + '@' + '302769cc2f56a0898ce67274ac8543c8b80e5d9a', 'src/flutter/third_party/rapidjson': Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b', @@ -719,7 +719,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:33v6' + 'version': 'version:34v2' } ], 'condition': 'download_android_deps', From 971a6cfc8686a3e89234ac06fc5f1676866f857f Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Mon, 6 Nov 2023 12:09:01 -0800 Subject: [PATCH 15/29] Point towards newest commit in the buildroot repo --- DEPS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 2107977dca398..6877b73f60de4 100644 --- a/DEPS +++ b/DEPS @@ -143,7 +143,7 @@ vars = { "upstream_boringssl_gen": "https://github.com/dart-lang/boringssl_gen.git", "upstream_boringssl": "https://github.com/openssl/openssl.git", "upstream_browser_launcher": "https://github.com/dart-lang/browser_launcher.git", - "upstream_buildroot": "https://github.com/gmackall/buildroot.git", + "upstream_buildroot": "https://github.com/flutter/buildroot.git", "upstream_cli_util": "https://github.com/dart-lang/cli_util.git", "upstream_clock": "https://github.com/dart-lang/clock.git", "upstream_collection": "https://github.com/dart-lang/collection.git", @@ -262,7 +262,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/gmackall/buildroot.git' + '@' + '302769cc2f56a0898ce67274ac8543c8b80e5d9a', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '6508cc599e7b72c282bec5360ea7b6063f557882', 'src/flutter/third_party/rapidjson': Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b', From 9eb714e08ed66afdab41130e4519db67c83b2a9a Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Tue, 7 Nov 2023 13:35:18 -0800 Subject: [PATCH 16/29] 34v2->34v3 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 6877b73f60de4..9a5095e257a1b 100644 --- a/DEPS +++ b/DEPS @@ -719,7 +719,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:34v2' + 'version': 'version:34v3' } ], 'condition': 'download_android_deps', From 231f261c0bf250eeb8fd49f659608642b451e3fd Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 7 Nov 2023 14:16:32 -0800 Subject: [PATCH 17/29] stop testing jelly_bean --- .../platform/SingleViewPresentation.java | 2 +- .../embedding/android/FlutterActivityTest.java | 2 +- .../localization/LocalizationPluginTest.java | 10 +++++----- .../plugin/platform/PlatformPluginTest.java | 18 +++++++++--------- .../platform/SingleViewPresentationTest.java | 6 +++--- tools/android_sdk/create_cipd_packages.sh | 7 +++++++ 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java b/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java index 08d52867eb2d4..b7ca559ac7c64 100644 --- a/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java +++ b/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java @@ -51,7 +51,7 @@ * EmbeddedView */ @Keep -@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) +@TargetApi(Build.VERSION_CODES.KITKAT) class SingleViewPresentation extends Presentation { private static final String TAG = "PlatformViewsController"; diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java index 9f9ecd6d63774..30dd648beac6e 100644 --- a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java +++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java @@ -485,7 +485,7 @@ public void itReleaseEngineWhenOnDestroy() { } @Test - @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.P) + @Config(minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.P) public void fullyDrawn_beforeAndroidQ() { Intent intent = FlutterActivityWithReportFullyDrawn.createDefaultIntent(ctx); ActivityController activityController = diff --git a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java index a1e8a12716816..6afa97bdf17cc 100644 --- a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java +++ b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java @@ -238,7 +238,7 @@ public void computePlatformResolvedLocale_fromAndroidN() { // Tests the legacy pre API 24 algorithm. @Test @Config( - minSdk = Build.VERSION_CODES.JELLY_BEAN, + minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "es-rMX") public void computePlatformResolvedLocale_emptySupportedLocales_beforeAndroidN() { @@ -252,7 +252,7 @@ public void computePlatformResolvedLocale_emptySupportedLocales_beforeAndroidN() } @Test - @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.M, qualifiers = "") + @Config(minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "") public void computePlatformResolvedLocale_selectFirstLocaleWhenNoUserSetting_beforeAndroidN() { FlutterJNI flutterJNI = new FlutterJNI(); DartExecutor dartExecutor = mock(DartExecutor.class); @@ -273,7 +273,7 @@ public void computePlatformResolvedLocale_selectFirstLocaleWhenNoUserSetting_bef @Test @Config( - minSdk = Build.VERSION_CODES.JELLY_BEAN, + minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "fr-rCH") public void computePlatformResolvedLocale_selectFirstLocaleWhenNoExactMatch_beforeAndroidN() { @@ -299,7 +299,7 @@ public void computePlatformResolvedLocale_selectFirstLocaleWhenNoExactMatch_befo @Test @Config( - minSdk = Build.VERSION_CODES.JELLY_BEAN, + minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "it-rIT") public void computePlatformResolvedLocale_selectExactMatchLocale_beforeAndroidN() { @@ -325,7 +325,7 @@ public void computePlatformResolvedLocale_selectExactMatchLocale_beforeAndroidN( @Test @Config( - minSdk = Build.VERSION_CODES.JELLY_BEAN, + minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "fr-rCH") public void computePlatformResolvedLocale_selectOnlyLanguageLocale_beforeAndroidN() { diff --git a/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java b/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java index 3a77e6ae68cc1..23b7fbf5b6a98 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java @@ -52,7 +52,7 @@ public class PlatformPluginTest { private final Context ctx = ApplicationProvider.getApplicationContext(); - @Config(sdk = 16) + @Config(sdk = Build.VERSION_CODES.KITKAT) @Test public void itIgnoresNewHapticEventsOnOldAndroidPlatforms() { View fakeDecorView = mock(View.class); @@ -70,7 +70,7 @@ public void itIgnoresNewHapticEventsOnOldAndroidPlatforms() { platformPlugin.vibrateHapticFeedback(PlatformChannel.HapticFeedbackType.SELECTION_CLICK); } - @Config(sdk = 29) + @Config(sdk = Build.VERSION_CODES.Q) @Test public void platformPlugin_getClipboardData() throws IOException { ClipboardManager clipboardManager = ctx.getSystemService(ClipboardManager.class); @@ -100,7 +100,7 @@ public void platformPlugin_getClipboardData() throws IOException { @SuppressWarnings("deprecation") // ClipboardManager.getText - @Config(sdk = 28) + @Config(sdk = Build.VERSION_CODES.P) @Test public void platformPlugin_hasStrings() { ClipboardManager clipboardManager = spy(ctx.getSystemService(ClipboardManager.class)); @@ -154,7 +154,7 @@ public void platformPlugin_hasStrings() { verify(clipboardManager, never()).getText(); } - @Config(sdk = 29) + @Config(sdk = Build.VERSION_CODES.Q) @Test public void setNavigationBarDividerColor() { View fakeDecorView = mock(View.class); @@ -229,7 +229,7 @@ public void setNavigationBarDividerColor() { } } - @Config(sdk = 30) + @Config(sdk = Build.VERSION_CODES.R) @Test public void setNavigationBarIconBrightness() { if (Build.VERSION.SDK_INT >= 30) { @@ -276,7 +276,7 @@ public void setNavigationBarIconBrightness() { } } - @Config(sdk = 30) + @Config(sdk = Build.VERSION_CODES.R) @Test public void setStatusBarIconBrightness() { if (Build.VERSION.SDK_INT >= 30) { @@ -323,7 +323,7 @@ public void setStatusBarIconBrightness() { @SuppressWarnings("deprecation") // SYSTEM_UI_FLAG_*, setSystemUiVisibility - @Config(sdk = 29) + @Config(sdk = Build.VERSION_CODES.Q) @Test public void setSystemUiMode() { View fakeDecorView = mock(View.class); @@ -440,7 +440,7 @@ public void setSystemUiModeListener_overlaysAreVisible() { @SuppressWarnings("deprecation") // SYSTEM_UI_FLAG_*, setSystemUiVisibility - @Config(sdk = 28) + @Config(sdk = Build.VERSION_CODES.P) @Test public void doNotEnableEdgeToEdgeOnOlderSdk() { View fakeDecorView = mock(View.class); @@ -462,7 +462,7 @@ public void doNotEnableEdgeToEdgeOnOlderSdk() { @SuppressWarnings("deprecation") // FLAG_TRANSLUCENT_STATUS, FLAG_TRANSLUCENT_NAVIGATION - @Config(sdk = 29) + @Config(sdk = Build.VERSION_CODES.Q) @Test public void verifyWindowFlagsSetToStyleOverlays() { View fakeDecorView = mock(View.class); diff --git a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java index 046682797623f..d27e08bbbdc97 100644 --- a/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java +++ b/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java @@ -4,7 +4,7 @@ package io.flutter.plugin.platform; -import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1; +import static android.os.Build.VERSION_CODES.KITKAT; import static android.os.Build.VERSION_CODES.P; import static android.os.Build.VERSION_CODES.R; import static org.junit.Assert.assertEquals; @@ -28,7 +28,7 @@ @TargetApi(P) public class SingleViewPresentationTest { @Test - @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R) + @Config(minSdk = KITKAT, maxSdk = R) public void returnsOuterContextInputMethodManager() { // There's a bug in Android Q caused by the IMM being instanced per display. // https://github.com/flutter/flutter/issues/38375. We need the context returned by @@ -59,7 +59,7 @@ public void returnsOuterContextInputMethodManager() { } @Test - @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R) + @Config(minSdk = KITKAT, maxSdk = R) public void returnsOuterContextInputMethodManager_createDisplayContext() { // The IMM should also persist across display contexts created from the base context. diff --git a/tools/android_sdk/create_cipd_packages.sh b/tools/android_sdk/create_cipd_packages.sh index 4adcc2c96affa..2887cc1679f0f 100755 --- a/tools/android_sdk/create_cipd_packages.sh +++ b/tools/android_sdk/create_cipd_packages.sh @@ -115,6 +115,13 @@ for platform in "${platforms[@]}"; do done done + # Special treatment for NDK to move to expected directory. + mv $upload_dir/sdk/ndk $upload_dir/ndk-bundle + ndk_sub_paths=`find $upload_dir/ndk-bundle -maxdepth 1 -type d` + ndk_sub_paths_arr=($ndk_sub_paths) + mv ${ndk_sub_paths_arr[1]} $upload_dir/ndk + rm -rf $upload_dir/ndk-bundle + # Accept all licenses to ensure they are generated and uploaded. yes "y" | $sdkmanager_path --licenses --sdk_root=$sdk_root cp -r "$sdk_root/licenses" "$upload_dir/sdk" From 047393872c2c0aaaa3e6e67514fe7bf0e1e43ea7 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 7 Nov 2023 14:29:06 -0800 Subject: [PATCH 18/29] undo change to cipd package creation script --- tools/android_sdk/create_cipd_packages.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/android_sdk/create_cipd_packages.sh b/tools/android_sdk/create_cipd_packages.sh index 2887cc1679f0f..4adcc2c96affa 100755 --- a/tools/android_sdk/create_cipd_packages.sh +++ b/tools/android_sdk/create_cipd_packages.sh @@ -115,13 +115,6 @@ for platform in "${platforms[@]}"; do done done - # Special treatment for NDK to move to expected directory. - mv $upload_dir/sdk/ndk $upload_dir/ndk-bundle - ndk_sub_paths=`find $upload_dir/ndk-bundle -maxdepth 1 -type d` - ndk_sub_paths_arr=($ndk_sub_paths) - mv ${ndk_sub_paths_arr[1]} $upload_dir/ndk - rm -rf $upload_dir/ndk-bundle - # Accept all licenses to ensure they are generated and uploaded. yes "y" | $sdkmanager_path --licenses --sdk_root=$sdk_root cp -r "$sdk_root/licenses" "$upload_dir/sdk" From 286489c5630c99ea58d599e5ecbd7c1380f3e6f4 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 7 Nov 2023 14:46:13 -0800 Subject: [PATCH 19/29] some missed jelly_bean tests --- .../plugin/localization/LocalizationPluginTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java index 6afa97bdf17cc..9b3d7ee921b7e 100644 --- a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java +++ b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java @@ -351,35 +351,35 @@ public void computePlatformResolvedLocale_selectOnlyLanguageLocale_beforeAndroid } // Tests the legacy pre API 21 algorithm. - @Config(sdk = 16) + @Config(sdk = Build.VERSION_CODES.KITKAT) @Test public void localeFromString_languageOnly() { Locale locale = LocalizationPlugin.localeFromString("en"); assertEquals(locale, new Locale("en")); } - @Config(sdk = 16) + @Config(sdk = Build.VERSION_CODES.KITKAT) @Test public void localeFromString_languageAndCountry() { Locale locale = LocalizationPlugin.localeFromString("en-US"); assertEquals(locale, new Locale("en", "US")); } - @Config(sdk = 16) + @Config(sdk = Build.VERSION_CODES.KITKAT) @Test public void localeFromString_languageCountryAndVariant() { Locale locale = LocalizationPlugin.localeFromString("zh-Hans-CN"); assertEquals(locale, new Locale("zh", "CN", "Hans")); } - @Config(sdk = 16) + @Config(sdk = Build.VERSION_CODES.KITKAT) @Test public void localeFromString_underscore() { Locale locale = LocalizationPlugin.localeFromString("zh_Hans_CN"); assertEquals(locale, new Locale("zh", "CN", "Hans")); } - @Config(sdk = 16) + @Config(sdk = Build.VERSION_CODES.KITKAT) @Test public void localeFromString_additionalVariantsAreIgnored() { Locale locale = LocalizationPlugin.localeFromString("de-DE-u-co-phonebk"); From 7cc375b80afda989dd248f14c681473861831dc3 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 7 Nov 2023 15:29:35 -0800 Subject: [PATCH 20/29] try out java 17 on a whim --- .ci.yaml | 6 +++--- DEPS | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index b6b83d5019c1f..b88edd33df1ee 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -27,7 +27,7 @@ platform_properties: # CIPD flutter/java/openjdk/$platform dependencies: >- [ - {"dependency": "open_jdk", "version": "version:11"}, + {"dependency": "open_jdk", "version": "version:17"}, {"dependency": "gradle_cache", "version": "none"} ] device_type: none @@ -49,7 +49,7 @@ platform_properties: # CIPD flutter/java/openjdk/$platform dependencies: >- [ - {"dependency": "open_jdk", "version": "version:11"} + {"dependency": "open_jdk", "version": "version:17"} ] device_type: none cpu: x86 @@ -76,7 +76,7 @@ platform_properties: # CIPD flutter/java/openjdk/$platform dependencies: >- [ - {"dependency": "open_jdk", "version": "version:11"} + {"dependency": "open_jdk", "version": "version:17"} ] device_type: none os: Windows-10 diff --git a/DEPS b/DEPS index 9a5095e257a1b..bb2c3cc636c74 100644 --- a/DEPS +++ b/DEPS @@ -751,7 +751,7 @@ deps = { 'packages': [ { 'package': 'flutter/java/openjdk/${{platform}}', - 'version': 'version:11' + 'version': 'version:17' } ], 'condition': 'download_android_deps', From 910eef6debc1ec201de14d1bd30ef25c92380e18 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 7 Nov 2023 16:36:55 -0800 Subject: [PATCH 21/29] do as the linter commands --- .../android/io/flutter/embedding/android/FlutterView.java | 4 ++-- .../PlayStoreDeferredComponentManager.java | 8 ++------ .../io/flutter/plugin/platform/PlatformPlugin.java | 7 ++++++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterView.java b/shell/platform/android/io/flutter/embedding/android/FlutterView.java index f5393bbaa43a0..4cfa3c8839ddc 100644 --- a/shell/platform/android/io/flutter/embedding/android/FlutterView.java +++ b/shell/platform/android/io/flutter/embedding/android/FlutterView.java @@ -233,7 +233,7 @@ public FlutterView(@NonNull Context context, @NonNull RenderMode renderMode) { renderSurface = flutterTextureView; } else { throw new IllegalArgumentException( - String.format("RenderMode not supported with this constructor: %s", renderMode)); + "RenderMode not supported with this constructor: " + renderMode); } init(); @@ -327,7 +327,7 @@ public FlutterView( renderSurface = flutterTextureView; } else { throw new IllegalArgumentException( - String.format("RenderMode not supported with this constructor: %s", renderMode)); + "RenderMode not supported with this constructor: " + renderMode); } init(); diff --git a/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java b/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java index 989566872de04..d7259880c29fd 100644 --- a/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java +++ b/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java @@ -330,17 +330,13 @@ public void installDeferredComponent(int loadingUnitId, @Nullable String compone case SplitInstallErrorCode.NETWORK_ERROR: flutterJNI.deferredComponentInstallFailure( loadingUnitId, - String.format( - "Install of deferred component module \"%s\" failed with a network error", - componentName), + "Install of deferred component module \"" + componentName + "\" failed with a network error", true); break; case SplitInstallErrorCode.MODULE_UNAVAILABLE: flutterJNI.deferredComponentInstallFailure( loadingUnitId, - String.format( - "Install of deferred component module \"%s\" failed as it is unavailable", - componentName), + "Install of deferred component module \"" + componentName + "\" failed as it is unavailable", false); break; default: diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java index 41ffa23853c7c..b142b812f0be4 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java @@ -11,6 +11,7 @@ import android.content.ClipDescription; import android.content.ClipboardManager; import android.content.Context; +import android.content.res.AssetFileDescriptor; import android.os.Build; import android.view.HapticFeedbackConstants; import android.view.SoundEffectConstants; @@ -517,8 +518,12 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for if (clip == null) return null; if (format == null || format == PlatformChannel.ClipboardContentFormat.PLAIN_TEXT) { ClipData.Item item = clip.getItemAt(0); + AssetFileDescriptor assetFileDescriptor; if (item.getUri() != null) - activity.getContentResolver().openTypedAssetFileDescriptor(item.getUri(), "text/*", null); + assetFileDescriptor = activity.getContentResolver().openTypedAssetFileDescriptor(item.getUri(), "text/*", null); + CharSequence charSequence = item.coerceToText(activity); + if (assetFileDescriptor != null) + assetFileDescriptor.close(); return item.coerceToText(activity); } } catch (SecurityException e) { From 2a87a9773195cd8fa7a5269e877739d71621ca4e Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 7 Nov 2023 16:38:08 -0800 Subject: [PATCH 22/29] yield to the bots round 2 (do as the formatter commands) --- .../android/io/flutter/plugin/platform/PlatformPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java index b142b812f0be4..c272db4472736 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java @@ -522,7 +522,7 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for if (item.getUri() != null) assetFileDescriptor = activity.getContentResolver().openTypedAssetFileDescriptor(item.getUri(), "text/*", null); CharSequence charSequence = item.coerceToText(activity); - if (assetFileDescriptor != null) + if (assetFileDescriptor != null) assetFileDescriptor.close(); return item.coerceToText(activity); } From 994cf9d2b2572419896ff9c2523cbd03d0cf087a Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 7 Nov 2023 16:39:38 -0800 Subject: [PATCH 23/29] format --- .../PlayStoreDeferredComponentManager.java | 8 ++++++-- .../io/flutter/plugin/platform/PlatformPlugin.java | 8 +++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java b/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java index d7259880c29fd..705becaa96c19 100644 --- a/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java +++ b/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java @@ -330,13 +330,17 @@ public void installDeferredComponent(int loadingUnitId, @Nullable String compone case SplitInstallErrorCode.NETWORK_ERROR: flutterJNI.deferredComponentInstallFailure( loadingUnitId, - "Install of deferred component module \"" + componentName + "\" failed with a network error", + "Install of deferred component module \"" + + componentName + + "\" failed with a network error", true); break; case SplitInstallErrorCode.MODULE_UNAVAILABLE: flutterJNI.deferredComponentInstallFailure( loadingUnitId, - "Install of deferred component module \"" + componentName + "\" failed as it is unavailable", + "Install of deferred component module \"" + + componentName + + "\" failed as it is unavailable", false); break; default: diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java index c272db4472736..ad1e64b54fae9 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java @@ -520,10 +520,12 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for ClipData.Item item = clip.getItemAt(0); AssetFileDescriptor assetFileDescriptor; if (item.getUri() != null) - assetFileDescriptor = activity.getContentResolver().openTypedAssetFileDescriptor(item.getUri(), "text/*", null); + assetFileDescriptor = + activity + .getContentResolver() + .openTypedAssetFileDescriptor(item.getUri(), "text/*", null); CharSequence charSequence = item.coerceToText(activity); - if (assetFileDescriptor != null) - assetFileDescriptor.close(); + if (assetFileDescriptor != null) assetFileDescriptor.close(); return item.coerceToText(activity); } } catch (SecurityException e) { From 0ba27dd123664b1ce238482eb125c06f3d1a0458 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 7 Nov 2023 16:54:35 -0800 Subject: [PATCH 24/29] catch error and initialize to null --- .../io/flutter/plugin/platform/PlatformPlugin.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java index ad1e64b54fae9..615a946554d93 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java @@ -26,6 +26,7 @@ import io.flutter.Log; import io.flutter.embedding.engine.systemchannels.PlatformChannel; import java.io.FileNotFoundException; +import java.io.IOException; import java.util.List; /** Android implementation of the platform plugin. */ @@ -518,7 +519,7 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for if (clip == null) return null; if (format == null || format == PlatformChannel.ClipboardContentFormat.PLAIN_TEXT) { ClipData.Item item = clip.getItemAt(0); - AssetFileDescriptor assetFileDescriptor; + AssetFileDescriptor assetFileDescriptor = null; if (item.getUri() != null) assetFileDescriptor = activity @@ -538,6 +539,13 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for return null; } catch (FileNotFoundException e) { return null; + } catch (IOException e) { + Log.w( + TAG, + "Failed to close AssetFileDescriptor while accessing clipboard data.", + e + ); + return null; } return null; From 38556e24911029050a51bd040dd340ea4e1b077b Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Tue, 7 Nov 2023 16:55:07 -0800 Subject: [PATCH 25/29] format --- .../android/io/flutter/plugin/platform/PlatformPlugin.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java index 615a946554d93..d1e2e11a58260 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java @@ -540,11 +540,7 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for } catch (FileNotFoundException e) { return null; } catch (IOException e) { - Log.w( - TAG, - "Failed to close AssetFileDescriptor while accessing clipboard data.", - e - ); + Log.w(TAG, "Failed to close AssetFileDescriptor while accessing clipboard data.", e); return null; } From 18bc6506af1cb9ad8c956ab1ac95a4148b332e20 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Wed, 8 Nov 2023 11:03:24 -0800 Subject: [PATCH 26/29] undo change to close file descriptor and remake baseline --- .../plugin/platform/PlatformPlugin.java | 12 +----- tools/android_lint/baseline.xml | 38 +++++++++---------- tools/android_lint/project.xml | 10 ++++- 3 files changed, 28 insertions(+), 32 deletions(-) diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java index d1e2e11a58260..fe97a91c2c8c2 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java @@ -26,7 +26,6 @@ import io.flutter.Log; import io.flutter.embedding.engine.systemchannels.PlatformChannel; import java.io.FileNotFoundException; -import java.io.IOException; import java.util.List; /** Android implementation of the platform plugin. */ @@ -519,14 +518,8 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for if (clip == null) return null; if (format == null || format == PlatformChannel.ClipboardContentFormat.PLAIN_TEXT) { ClipData.Item item = clip.getItemAt(0); - AssetFileDescriptor assetFileDescriptor = null; if (item.getUri() != null) - assetFileDescriptor = - activity - .getContentResolver() - .openTypedAssetFileDescriptor(item.getUri(), "text/*", null); - CharSequence charSequence = item.coerceToText(activity); - if (assetFileDescriptor != null) assetFileDescriptor.close(); + activity.getContentResolver().openTypedAssetFileDescriptor(item.getUri(), "text/*", null); return item.coerceToText(activity); } } catch (SecurityException e) { @@ -539,9 +532,6 @@ private CharSequence getClipboardData(PlatformChannel.ClipboardContentFormat for return null; } catch (FileNotFoundException e) { return null; - } catch (IOException e) { - Log.w(TAG, "Failed to close AssetFileDescriptor while accessing clipboard data.", e); - return null; } return null; diff --git a/tools/android_lint/baseline.xml b/tools/android_lint/baseline.xml index 41e7e89b6a6f4..11ed846154170 100644 --- a/tools/android_lint/baseline.xml +++ b/tools/android_lint/baseline.xml @@ -1,5 +1,5 @@ - + @@ -19,7 +19,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -30,7 +30,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -41,7 +41,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -52,7 +52,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -78,6 +78,17 @@ column="82"/> + + + + @@ -96,19 +107,8 @@ errorLine2=" ~~~~~~~~~~~~"> - - - - diff --git a/tools/android_lint/project.xml b/tools/android_lint/project.xml index c15adb44c9008..f3eeafdb2b6b2 100644 --- a/tools/android_lint/project.xml +++ b/tools/android_lint/project.xml @@ -53,6 +53,7 @@ + @@ -84,6 +85,7 @@ + @@ -93,6 +95,7 @@ + @@ -102,7 +105,9 @@ - + + + @@ -110,11 +115,11 @@ - + @@ -141,6 +146,7 @@ + From a6765b4c309aa082bbebade68e0c7ec308a1cc6c Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Wed, 8 Nov 2023 11:04:27 -0800 Subject: [PATCH 27/29] format --- .../android/io/flutter/plugin/platform/PlatformPlugin.java | 1 - 1 file changed, 1 deletion(-) diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java index fe97a91c2c8c2..41ffa23853c7c 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java @@ -11,7 +11,6 @@ import android.content.ClipDescription; import android.content.ClipboardManager; import android.content.Context; -import android.content.res.AssetFileDescriptor; import android.os.Build; import android.view.HapticFeedbackConstants; import android.view.SoundEffectConstants; From c0043e88c709512801de5a96d844a69196ec6688 Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Wed, 8 Nov 2023 13:30:31 -0800 Subject: [PATCH 28/29] Update DEPS --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index bb2c3cc636c74..df855580980fa 100644 --- a/DEPS +++ b/DEPS @@ -262,7 +262,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '6508cc599e7b72c282bec5360ea7b6063f557882', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '44ca359ea6fada2fa1bb007b81994fa4dc8ce2ec', 'src/flutter/third_party/rapidjson': Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b', From aa3c7cce865cb1d58a7268ffefbff99233c1410c Mon Sep 17 00:00:00 2001 From: Gray Mackall <34871572+gmackall@users.noreply.github.com> Date: Wed, 8 Nov 2023 16:06:53 -0800 Subject: [PATCH 29/29] Change targetSdkVersion to 34 in AndroidManifest.xml --- shell/platform/android/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/AndroidManifest.xml b/shell/platform/android/AndroidManifest.xml index 2b904fe0412ef..82f4b0a7c5da9 100644 --- a/shell/platform/android/AndroidManifest.xml +++ b/shell/platform/android/AndroidManifest.xml @@ -5,7 +5,7 @@ --> - +