From 822920ff5b1d1145463fc193d338afcfe9dfabaa Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Mon, 11 May 2020 14:16:20 +0200 Subject: [PATCH] REVERTME: ModemConfig: Use platform APIs for SystemProperties Unfortunately sysprop - which is the SDK-compliant repacement for SystemProperties - does not work properly in Android Q. Specificially a java library is not generated and passed to the java compiler when building ModemConfig. This works flawlessly in Android R. Use SystemProperties from the private API as a stop-gap solution, until we either pick a build-system fix or move to R. Signed-off-by: Marijn Suijten --- ModemConfig/Android.bp | 2 +- .../sony/opentelephony/modemconfig/ModemConfigService.kt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ModemConfig/Android.bp b/ModemConfig/Android.bp index 248ab91..5b5e229 100644 --- a/ModemConfig/Android.bp +++ b/ModemConfig/Android.bp @@ -7,5 +7,5 @@ android_app { srcs: ["src/**/*.kt"], - sdk_version: "system_current", + platform_apis: true, } diff --git a/ModemConfig/src/com/sony/opentelephony/modemconfig/ModemConfigService.kt b/ModemConfig/src/com/sony/opentelephony/modemconfig/ModemConfigService.kt index 8958c38..739ea5f 100644 --- a/ModemConfig/src/com/sony/opentelephony/modemconfig/ModemConfigService.kt +++ b/ModemConfig/src/com/sony/opentelephony/modemconfig/ModemConfigService.kt @@ -20,6 +20,7 @@ import android.app.Service import android.content.Context import android.content.Intent import android.os.IBinder +import android.os.SystemProperties import android.telephony.SubscriptionInfo import android.telephony.SubscriptionManager import android.telephony.TelephonyManager @@ -161,6 +162,12 @@ context.resources.getXml(R.xml.service_provider_sim_configs).use { val globalTm = getSystemService(TelephonyManager::class.java) val tm = globalTm!!.createForSubscriptionId(sub.subscriptionId) val name = findConfigurationName(this, tm) + + if (name != null) { + val prop = "persist.vendor.somc.cust.modem${sub.simSlotIndex}" + if (VERBOSE) Log.v(TAG, "Setting $prop to $name") + SystemProperties.set(prop, name) + } } override fun onCreate() {