Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix kotlin deprecation warnings" am: f9bf6544a6

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

Change-Id: I5a9011f30f9827fde42d1596035ab310355fbe68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-06-10 19:45:11 +00:00
committed by Automerger Merge Worker
parent 69f8011ec8 f9bf6544a6
commit 255f4d7911
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt
View File

@@ -97,7 +97,7 @@ class StaleDataclassProcessor: AbstractProcessor() {
private fun elemToString(elem: Element): String { private fun elemToString(elem: Element): String {
return buildString { return buildString {
append(elem.modifiers.joinToString(" ") { it.name.toLowerCase() }) append(elem.modifiers.joinToString(" ") { it.name.lowercase() })
append(" ") append(" ")
append(elem.annotationMirrors.joinToString(" ", transform = { annotationToString(it) })) append(elem.annotationMirrors.joinToString(" ", transform = { annotationToString(it) }))
append(" ") append(" ")

2
tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt
View File

@@ -29,7 +29,7 @@ object CodeUtils {
*/ */
fun hash(position: String, messageString: String, logLevel: LogLevel, logGroup: LogGroup): Int { fun hash(position: String, messageString: String, logLevel: LogLevel, logGroup: LogGroup): Int {
return (position + messageString + logLevel.name + logGroup.name) 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) { fun checkWildcardStaticImported(code: CompilationUnit, className: String, fileName: String) {