From a73c1002a6fafe73773e371de6a27f83ffbb23e3 Mon Sep 17 00:00:00 2001 From: Mohellebi abdessalem <116356835+AbdeMohlbi@users.noreply.github.com> Date: Wed, 7 Jan 2026 15:47:25 +0100 Subject: [PATCH] Remove more `requires 24` anotations (#180116) similar to #180051 save_0 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --- .../io/flutter/embedding/android/FlutterActivity.java | 4 ---- .../android/FlutterActivityAndFragmentDelegate.java | 2 -- .../android/io/flutter/plugin/mouse/MouseCursorPlugin.java | 6 +----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java index fc7c2c17549..e7d982d4a81 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivity.java @@ -629,7 +629,6 @@ public class FlutterActivity extends Activity } @Override - @RequiresApi(API_LEVELS.API_24) protected void onCreate(@Nullable Bundle savedInstanceState) { switchLaunchThemeForNormalTheme(); @@ -799,7 +798,6 @@ public class FlutterActivity extends Activity } @NonNull - @RequiresApi(API_LEVELS.API_24) private View createFlutterView() { return delegate.onCreateView( /* inflater=*/ null, @@ -897,7 +895,6 @@ public class FlutterActivity extends Activity } @Override - @RequiresApi(API_LEVELS.API_24) public void detachFromFlutterEngine() { Log.w( TAG, @@ -913,7 +910,6 @@ public class FlutterActivity extends Activity } @Override - @RequiresApi(API_LEVELS.API_24) protected void onDestroy() { super.onDestroy(); if (stillAttachedForEvent("onDestroy")) { diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java index b8c07e2b13d..7eadd5c9065 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java @@ -369,7 +369,6 @@ import java.util.List; * */ @NonNull - @RequiresApi(API_LEVELS.API_24) View onCreateView( LayoutInflater inflater, @Nullable ViewGroup container, @@ -668,7 +667,6 @@ import java.util.List; * *

This method removes this delegate's {@link FlutterView}'s {@link FlutterUiDisplayListener}. */ - @RequiresApi(API_LEVELS.API_24) void onDestroyView() { Log.v(TAG, "onDestroyView()"); ensureAlive(); diff --git a/engine/src/flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java b/engine/src/flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java index 53b86f487cc..508d9dad90b 100644 --- a/engine/src/flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java +++ b/engine/src/flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java @@ -4,16 +4,12 @@ package io.flutter.plugin.mouse; -import static io.flutter.Build.API_LEVELS; - import android.view.PointerIcon; import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; import io.flutter.embedding.engine.systemchannels.MouseCursorChannel; import java.util.HashMap; /** A mandatory plugin that handles mouse cursor requests. */ -@RequiresApi(API_LEVELS.API_24) public class MouseCursorPlugin { @NonNull private final MouseCursorViewDelegate mView; @NonNull private final MouseCursorChannel mouseCursorChannel; @@ -115,7 +111,7 @@ public class MouseCursorPlugin { /** * Gets a system pointer icon object for the given {@code type}. * - *

If typeis not recognized, returns the default pointer icon. + *

If type is not recognized, returns the default pointer icon. * *

This is typically implemented by calling {@link android.view.PointerIcon#getSystemIcon} * with the context associated with this view.