diff --git a/DEPS b/DEPS index 23deed99f4ca3..a3cfd4dc4a0b1 100644 --- a/DEPS +++ b/DEPS @@ -111,7 +111,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f582982073b6f04b7a70bc284bac8fafa6c0a846', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '8ce3dadcb6bb3e05570e1b5748fbc2716d264bb0', # Fuchsia compatibility # @@ -571,7 +571,7 @@ deps = { 'packages': [ { 'package': 'flutter/android/sdk/all/${{platform}}', - 'version': 'version:31v8' + 'version': 'version:32v1' } ], 'condition': 'download_android_deps', diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterView.java b/shell/platform/android/io/flutter/embedding/android/FlutterView.java index 538249703216b..d5fcac7d50e61 100644 --- a/shell/platform/android/io/flutter/embedding/android/FlutterView.java +++ b/shell/platform/android/io/flutter/embedding/android/FlutterView.java @@ -1028,7 +1028,7 @@ public View findViewByAccessibilityIdTraversal(int accessibilityId) { * @param currentView The root view. * @return A descendant of currentView or currentView itself. */ - @SuppressLint("PrivateApi") + @SuppressLint("DiscouragedPrivateApi") private View findViewByAccessibilityIdRootedAtCurrentView(int accessibilityId, View currentView) { Method getAccessibilityViewIdMethod; try { diff --git a/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java b/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java index 67c5e390185eb..2c4ab15de3507 100644 --- a/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java +++ b/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java @@ -4,7 +4,6 @@ package io.flutter.embedding.engine.renderer; -import android.annotation.TargetApi; import android.graphics.Bitmap; import android.graphics.Rect; import android.graphics.SurfaceTexture; @@ -34,7 +33,6 @@ *

{@link io.flutter.embedding.android.FlutterSurfaceView} and {@link * io.flutter.embedding.android.FlutterTextureView} are implementations of {@link RenderSurface}. */ -@TargetApi(Build.VERSION_CODES.JELLY_BEAN) public class FlutterRenderer implements TextureRegistry { private static final String TAG = "FlutterRenderer"; diff --git a/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java b/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java index 5dc003e543148..38dc780ed79fe 100644 --- a/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java +++ b/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java @@ -4,6 +4,7 @@ package io.flutter.plugin.localization; +import android.annotation.SuppressLint; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; @@ -22,6 +23,7 @@ public class LocalizationPlugin { @NonNull private final LocalizationChannel localizationChannel; @NonNull private final Context context; + @SuppressLint("AppBundleLocaleChanges") // This is optionally turned on by apps. @VisibleForTesting final LocalizationChannel.LocalizationMessageHandler localizationMessageHandler = new LocalizationChannel.LocalizationMessageHandler() { diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java index a7d1c628b3c26..cb27706e37125 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java @@ -4,6 +4,7 @@ package io.flutter.plugin.platform; +import android.annotation.TargetApi; import android.app.Activity; import android.app.ActivityManager.TaskDescription; import android.content.ClipData; @@ -243,8 +244,7 @@ public void onSystemUiVisibilityChange(int visibility) { private void setSystemChromeEnabledSystemUIMode(PlatformChannel.SystemUiMode systemUiMode) { int enabledOverlays; - if (systemUiMode == PlatformChannel.SystemUiMode.LEAN_BACK - && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + if (systemUiMode == PlatformChannel.SystemUiMode.LEAN_BACK) { // LEAN BACK // Available starting at SDK 16 // Should not show overlays, tap to reveal overlays, needs onChange callback @@ -364,6 +364,7 @@ private void restoreSystemChromeSystemUIOverlays() { } @SuppressWarnings("deprecation") + @TargetApi(21) private void setSystemChromeSystemUIOverlayStyle( PlatformChannel.SystemChromeStyle systemChromeStyle) { Window window = activity.getWindow(); diff --git a/shell/platform/android/io/flutter/view/AccessibilityBridge.java b/shell/platform/android/io/flutter/view/AccessibilityBridge.java index 09aeb1c69663e..48f1ab700cc8a 100644 --- a/shell/platform/android/io/flutter/view/AccessibilityBridge.java +++ b/shell/platform/android/io/flutter/view/AccessibilityBridge.java @@ -2758,6 +2758,8 @@ private SpannableString createSpannableString(String string, List - + @@ -19,7 +19,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -30,58 +30,36 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - - - - - - - - + errorLine1=" return direction == View.LAYOUT_DIRECTION_LTR || direction == View.LAYOUT_DIRECTION_RTL;" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> + line="661" + column="25"/> + errorLine1=" return direction == View.LAYOUT_DIRECTION_LTR || direction == View.LAYOUT_DIRECTION_RTL;" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~"> + line="661" + column="67"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + errorLine1=" public boolean onTouchEvent(@NonNull MotionEvent event) {" + errorLine2=" ~~~~~~~~~~~~"> + file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java" + line="911" + column="18"/> diff --git a/tools/android_lint/lint.xml b/tools/android_lint/lint.xml index 241207161d5d6..c2f3729fa9fd8 100644 --- a/tools/android_lint/lint.xml +++ b/tools/android_lint/lint.xml @@ -7,5 +7,13 @@ compatible all the way back to API 16. See https://developer.android.com/studio/write/java8-support.html#supported_features --> - + + + + + + + + + \ No newline at end of file diff --git a/tools/android_lint/project.xml b/tools/android_lint/project.xml index bbd5ef893dbad..38b9f65eebcb8 100644 --- a/tools/android_lint/project.xml +++ b/tools/android_lint/project.xml @@ -4,56 +4,12 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -65,8 +21,9 @@ - + + @@ -78,6 +35,7 @@ + @@ -89,6 +47,7 @@ + @@ -135,6 +94,7 @@ + @@ -179,6 +139,7 @@ + diff --git a/tools/android_sdk/packages.txt b/tools/android_sdk/packages.txt index cba2d84474b22..c0961a9c7fe65 100644 --- a/tools/android_sdk/packages.txt +++ b/tools/android_sdk/packages.txt @@ -1,6 +1,6 @@ -platforms;android-31:platforms +platforms;android-32:platforms cmdline-tools;latest:cmdline-tools -build-tools;31.0.0:build-tools +build-tools;33.0.0-rc4:build-tools platform-tools:platform-tools tools:tools ndk-bundle:ndk-bundle \ No newline at end of file diff --git a/tools/cipd/android_embedding_bundle/build.gradle b/tools/cipd/android_embedding_bundle/build.gradle index 04ca45bd06615..66d2dfbc9aeb8 100644 --- a/tools/cipd/android_embedding_bundle/build.gradle +++ b/tools/cipd/android_embedding_bundle/build.gradle @@ -29,7 +29,7 @@ allprojects { apply plugin: "com.android.application" android { - compileSdkVersion 31 + compileSdkVersion 32 } configurations { diff --git a/tools/javadoc/gen_javadoc.py b/tools/javadoc/gen_javadoc.py index b1ed22ceb06c4..97a4cfb5d3e89 100755 --- a/tools/javadoc/gen_javadoc.py +++ b/tools/javadoc/gen_javadoc.py @@ -41,7 +41,7 @@ def main(): classpath = [ args.android_source_root, - os.path.join(args.third_party, 'android_tools/sdk/platforms/android-31/android.jar'), + os.path.join(args.third_party, 'android_tools/sdk/platforms/android-32/android.jar'), os.path.join(args.third_party, 'android_embedding_dependencies', 'lib', '*'), ] if args.build_config_path: