From 6dd5d788351cac109cf7114b9bf593ecda53d770 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sun, 27 Sep 2020 18:31:01 +0200 Subject: [PATCH 1/2] ModemConfig: Statically link SomcModemProperties Fixes: "Failed resolution of: Lcom/sony/opentelephony/modemconfig/SomcModemProperties;" --- ModemConfig/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModemConfig/Android.bp b/ModemConfig/Android.bp index adeb975..3bc7a34 100644 --- a/ModemConfig/Android.bp +++ b/ModemConfig/Android.bp @@ -9,7 +9,7 @@ android_app { required: ["privapp_whitelist_com.sony.opentelephony.modemconfig"], - libs: ["SomcModemProperties"], + static_libs: ["SomcModemProperties"], sdk_version: "system_current", } From 1497865ca17c3fb159255b5c2f153a1871caf3ab Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Sun, 27 Sep 2020 22:34:12 +0200 Subject: [PATCH 2/2] FIXUP: ModemConfig: vendor.somc.cust.modem\d is supposed to be persist. These properties were previously persistent but have inadevertently lost that during a refactor. It doesn't really matter what type it is since init files forward this to (broken) non vendor-prefixed persist properties anyway. Having only one pair persistent would be cleaner but requires modifying more repos (device-sony-{common,sepolicy}) which we rather do in one go when modem-switcher (blob) is updated to listen to a vendor-prefixed property instead. Fixes: e9db6200810ba62937c877b0b063ef946387296d Signed-off-by: Marijn Suijten --- ModemConfig/sysprop/SomcModemProperties.sysprop | 4 ++-- ModemConfig/sysprop/api/SomcModemProperties-current.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ModemConfig/sysprop/SomcModemProperties.sysprop b/ModemConfig/sysprop/SomcModemProperties.sysprop index b29d74e..7ec576e 100644 --- a/ModemConfig/sysprop/SomcModemProperties.sysprop +++ b/ModemConfig/sysprop/SomcModemProperties.sysprop @@ -6,7 +6,7 @@ prop { type: String scope: Internal access: ReadWrite - prop_name: "vendor.somc.cust.modem0" + prop_name: "persist.vendor.somc.cust.modem0" } prop { @@ -14,5 +14,5 @@ prop { type: String scope: Internal access: ReadWrite - prop_name: "vendor.somc.cust.modem1" + prop_name: "persist.vendor.somc.cust.modem1" } diff --git a/ModemConfig/sysprop/api/SomcModemProperties-current.txt b/ModemConfig/sysprop/api/SomcModemProperties-current.txt index 33658e2..e144aee 100644 --- a/ModemConfig/sysprop/api/SomcModemProperties-current.txt +++ b/ModemConfig/sysprop/api/SomcModemProperties-current.txt @@ -6,13 +6,13 @@ props { type: String access: ReadWrite scope: Internal - prop_name: "vendor.somc.cust.modem0" + prop_name: "persist.vendor.somc.cust.modem0" } prop { api_name: "cust_modem_1" type: String access: ReadWrite scope: Internal - prop_name: "vendor.somc.cust.modem1" + prop_name: "persist.vendor.somc.cust.modem1" } }