From fb3286f98ef8a7b1e47b90a6824b90719b4edabc Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Fri, 28 Feb 2020 07:56:23 -0700 Subject: [PATCH] matisse-common: libinit: Use commonized gsm_properties functions Moreover, add wifi_properties, since there are matisse variants without SIM/mobile networks support. Change-Id: Ie0ce095a726783c1e751db7857c963adb95e67b0 --- init/init_matisse.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/init/init_matisse.cpp b/init/init_matisse.cpp index 7d381b5..f62f7c6 100755 --- a/init/init_matisse.cpp +++ b/init/init_matisse.cpp @@ -49,7 +49,7 @@ void vendor_load_properties() set_ro_product_prop("fingerprint", "samsung/matissewifixx/matissewifi:5.0.2/LRX22G/T530XXS1BRH1:user/release-keys"); set_ro_product_prop("model", "SM-T530"); set_ro_product_prop("name", "matissewifi"); - wifi_properties(); + wifi_properties("wifi-only", "1"); } else if (bootloader.find("T530NU") == 0) { /* matissewifiue */ property_override("ro.build.description", "matissewifiue-user 5.0.2 LRX22G T530NUUEU1BQC1 release-keys"); @@ -57,7 +57,7 @@ void vendor_load_properties() set_ro_product_prop("fingerprint", "samsung/matissewifiue/matissewifiue:5.0.2/LRX22G/T530NUUEU1BQC1:user/release-keys"); set_ro_product_prop("model", "SM-T530NU"); set_ro_product_prop("name", "matissewifiue"); - wifi_properties(); + wifi_properties("wifi-only", "1"); } else if (bootloader.find("T531XX") == 0) { /* matisse3gxx */ property_override("ro.build.description", "matisse3gxx-user 5.0.2 LRX22G T531XXS1BRH1 release-keys"); @@ -65,7 +65,7 @@ void vendor_load_properties() set_ro_product_prop("fingerprint", "samsung/matisse3gxx/matisse3g:5.0.2/LRX22G/T531XXS1BRH1:user/release-keys"); set_ro_product_prop("model", "SM-T531"); set_ro_product_prop("name", "matisse3g"); - gsm_properties(); + gsm_properties("3", "0"); } else if (bootloader.find("T532XX") == 0) { /* matisse3gjvxx */ property_override("ro.build.description", "matisse3gjv-user 5.0.2 LRX22G T532JVS1BQB1 release-keys"); @@ -73,7 +73,7 @@ void vendor_load_properties() set_ro_product_prop("fingerprint", "samsung/matisse3gjv/matisse3g:5.0.2/LRX22G/T532JVS1BQB1:user/release-keys"); set_ro_product_prop("model", "SM-T532"); set_ro_product_prop("name", "matisse3gjv"); - gsm_properties(); + gsm_properties("3", "0"); } else if (bootloader.find("T535XX") == 0) { /* matisseltexx */ property_override("ro.build.description", "matisseltexx-user 5.0.2 LRX22G T535XXS1BRJ2 release-keys"); @@ -81,9 +81,9 @@ void vendor_load_properties() set_ro_product_prop("fingerprint", "samsung/matisseltexx/matisselte:5.0.2/LRX22G/T535XXS1BRJ2:user/release-keys"); set_ro_product_prop("model", "SM-T535"); set_ro_product_prop("name", "matisselte"); - lte_properties(); + gsm_properties("9", "1"); } else { - wifi_properties(); + wifi_properties("wifi-only", "1"); } std::string device = GetProperty("ro.product.device", "");