From e89480f02ddabee5be32e1d91ef7fc28adce16c7 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matanlurey@users.noreply.github.com>
Date: Wed, 25 Sep 2024 15:41:11 -0700
Subject: [PATCH] Move lint suppression from `baseline.xml` to `@SuppressLint`.
 (flutter/engine#55447)

I think you just had the lint identifier wrong?

Closes https://github.com/flutter/flutter/issues/155712.
---
 .../io/flutter/embedding/android/FlutterView.java     |  2 +-
 engine/src/flutter/tools/android_lint/baseline.xml    | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java
index 4c6d5448ae7..0d5ae3a8efc 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java
@@ -683,7 +683,7 @@ public class FlutterView extends FrameLayout
   // The annotations to suppress "InlinedApi" and "NewApi" lints prevent lint warnings
   // caused by usage of Android Q APIs. These calls are safe because they are
   // guarded.
-  @SuppressLint({"InlinedApi", "NewApi"})
+  @SuppressLint({"InlinedApi", "NewApi", "DeprecatedSinceApi"})
   @NonNull
   public final WindowInsets onApplyWindowInsets(@NonNull WindowInsets insets) {
     WindowInsets newInsets = super.onApplyWindowInsets(insets);
diff --git a/engine/src/flutter/tools/android_lint/baseline.xml b/engine/src/flutter/tools/android_lint/baseline.xml
index c3932724a82..a374b1cd795 100644
--- a/engine/src/flutter/tools/android_lint/baseline.xml
+++ b/engine/src/flutter/tools/android_lint/baseline.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <issues format="6" by="lint 8.3.0 [11479570] " type="baseline" client="" dependencies="true" name="" variant="all" version="8.3.0 [11479570] ">
 
-    <issue
-        id="DeprecatedSinceApi"
-        message="This method is deprecated as of API level 30"
-        errorLine1="        zeroSides = calculateShouldZeroSides();"
-        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java"
-            line="759"
-            column="21"/>
-    </issue>
-
     <issue
         id="HardcodedDebugMode"
         message="Avoid hardcoding the debug mode; leaving it out allows debug and release builds to automatically assign one"