joy/android_hardware_sony_SonyOpenTelephony
Watch
1
Fork
You've already forked android_hardware_sony_SonyOpenTelephony
 0
Code Issues Pull requests Projects Releases Wiki Activity

[R] ModemConfig: Replace try-with-resources with .use block

Browse source 
Q kotlinc chokes on it.

Signed-off-by: Marijn Suijten <marijns95@gmail.com>
This commit is contained in:
Marijn Suijten 2020-09-09 22:39:47 +02:00
commit 1b7bdd82ec
1 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ModemConfig/src/com/sony/opentelephony/modemconfig/ModemConfigService.kt
View file

@ -73,16 +73,7 @@ class ModemConfigService : Service() {
val currentMap = hashMapOf<String, String>()
var simConfigId: String? = null
// TODO: Kotlin .use {} block doesn't work here, while it does in regular apps...
/*
modemconfig/ModemConfigReceiver.kt:63:70: error: unresolved reference. None of the following
candidates is applicable because of receiver type mismatch:
@InlineOnly public inline fun <T : Closeable?, R> ???.use(block: (???) -> ???): ???
defined in kotlin.io
context.resources.getXml(R.xml.service_provider_sim_configs).use {
*/
val xml = context.resources.getXml(R.xml.service_provider_sim_configs)
try {
context.resources.getXml(R.xml.service_provider_sim_configs).use { xml ->
while (xml.next() != XmlPullParser.END_DOCUMENT) {
if (xml.eventType == XmlPullParser.END_TAG &&
xml.name == "service_provider_sim_config") {
@ -117,9 +108,6 @@ context.resources.getXml(R.xml.service_provider_sim_configs).use {
currentMap[xml.name] = text
}
}
} finally {
xml.close()
}
list.sortByDescending { it.specificity() }