2 files changed, 2 insertions, 11 deletions
diff --git a/tools/lint/checks/src/main/java/com/google/android/lint/parcel/SaferParcelChecker.kt b/tools/lint/checks/src/main/java/com/google/android/lint/parcel/SaferParcelChecker.kt
index bf99e8e669fc..f92826316be4 100644
--- a/tools/lint/checks/src/main/java/com/google/android/lint/parcel/SaferParcelChecker.kt
+++ b/tools/lint/checks/src/main/java/com/google/android/lint/parcel/SaferParcelChecker.kt
@@ -48,18 +48,9 @@ class SaferParcelChecker : Detector(), SourceCodeScanner {
         return "$prefix$name($parameters)"
     }
 
-    /** Taken from androidx-main:core/core/src/main/java/androidx/core/os/BuildCompat.java */
     private fun isAtLeastT(context: Context): Boolean {
         val project = if (context.isGlobalAnalysis()) context.mainProject else context.project
-        return project.isAndroidProject
-                && project.minSdkVersion.featureLevel >= 32
-                && isAtLeastPreReleaseCodename("Tiramisu", project.minSdkVersion.codename)
-    }
-
-    /** Taken from androidx-main:core/core/src/main/java/androidx/core/os/BuildCompat.java */
-    private fun isAtLeastPreReleaseCodename(min: String, actual: String): Boolean {
-        if (actual == "REL") return false
-        return actual.uppercase(Locale.ROOT) >= min.uppercase(Locale.ROOT)
+        return project.isAndroidProject && project.minSdkVersion.featureLevel >= 33
     }
 
     companion object {
diff --git a/tools/lint/checks/src/test/java/com/google/android/lint/parcel/SaferParcelCheckerTest.kt b/tools/lint/checks/src/test/java/com/google/android/lint/parcel/SaferParcelCheckerTest.kt
index 1286e519aae6..e686695ca804 100644
--- a/tools/lint/checks/src/test/java/com/google/android/lint/parcel/SaferParcelCheckerTest.kt
+++ b/tools/lint/checks/src/test/java/com/google/android/lint/parcel/SaferParcelCheckerTest.kt
@@ -729,7 +729,7 @@ class SaferParcelCheckerTest : LintDetectorTest() {
 
     private val includes =
         arrayOf(
-            manifest().minSdk("Tiramisu"),
+            manifest().minSdk("33"),
             java(
                 """
                         package android.os;