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

Commit 207cd61e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix kotlin deprecation warnings" am: f9bf6544 am: 255f4d79 am: 9c081653 am: 1f09d229 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115256



Change-Id: I2ede584de82e28612f6ac5f15c50901a28c42476
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fe307539 1f09d229

tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ class StaleDataclassProcessor: AbstractProcessor() { 


    private fun elemToString(elem: Element): String {

        return buildString {

            append(elem.modifiers.joinToString(" ") { it.name.toLowerCase() })

            append(elem.modifiers.joinToString(" ") { it.name.lowercase() })

            append(" ")

            append(elem.annotationMirrors.joinToString(" ", transform = { annotationToString(it) }))

            append(" ")

tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ object CodeUtils { 
     */

    fun hash(position: String, messageString: String, logLevel: LogLevel, logGroup: LogGroup): Int {

        return (position + messageString + logLevel.name + logGroup.name)

                .map { c -> c.toInt() }.reduce { h, c -> h * 31 + c }

                .map { c -> c.code }.reduce { h, c -> h * 31 + c }

    }



    fun checkWildcardStaticImported(code: CompilationUnit, className: String, fileName: String) {