Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9974dd6e authored by Cole Faust's avatar Cole Faust Committed by Android (Google) Code Review
Browse files

Merge "Don't check project codename"

parents fa415fc4 3f8e223f

tools/lint/checks/src/main/java/com/google/android/lint/parcel/SaferParcelChecker.kt

+1 −10
Original line number Diff line number Diff line
@@ -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 {

tools/lint/checks/src/test/java/com/google/android/lint/parcel/SaferParcelCheckerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ class SaferParcelCheckerTest : LintDetectorTest() { 


    private val includes =

        arrayOf(

            manifest().minSdk("Tiramisu"),

            manifest().minSdk("33"),

            java(

                """

                        package android.os;