diff --git a/Android.mk b/Android.mk index ec87143..16df11b 100644 --- a/Android.mk +++ b/Android.mk @@ -16,6 +16,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),s3ve3gjv) +ifeq ($(TARGET_DEVICE),matissewifi) include $(call all-subdir-makefiles,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index d78ffe4..d07748a 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -14,4 +14,4 @@ # limitations under the License. PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_s3ve3gjv.mk + $(LOCAL_DIR)/lineage_matissewifi.mk diff --git a/BoardConfig.mk b/BoardConfig.mk index a7d6969..9e4f000 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -13,21 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -# inherit from common s3ve3g -include device/samsung/s3ve3g-common/BoardConfigCommon.mk +# inherit from common matisse +include device/samsung/matisse-common/BoardConfigCommon.mk + +# Assert +TARGET_OTA_ASSERT_DEVICE := matissewifi # Kernel -TARGET_KERNEL_CONFIG := lineage_s3ve3gjv_defconfig +TARGET_KERNEL_CONFIG := lineage_matissewifi_defconfig # Init TARGET_INIT_VENDOR_LIB := libinit_msm8226 -TARGET_LIBINIT_MSM8226_DEFINES_FILE := device/samsung/s3ve3gjv/init/init_s3ve3g.cpp +# TARGET_LIBINIT_MSM8226_DEFINES_FILE := device/samsung/matissewifi/init/init_matisse.cpp -# NFC -# include $(COMMON_PATH)/nfc/pn547/board.mk - -# Radio/RIL -include $(COMMON_PATH)/radio/single/board.mk +# HIDL +DEVICE_MANIFEST_FILE += device/samsung/matissewifi/manifest.xml # inherit from the proprietary version --include vendor/samsung/s3ve3gjv/BoardConfigVendor.mk +-include vendor/samsung/matissewifi/BoardConfigVendor.mk diff --git a/README.md b/README.md index 64ff04b..23f3bf2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Device Tree For Samsung Galaxy S3 Neo +Device Tree For Samsung Galaxy Tab 4 10.1 ===================================== | Basic | Spec Sheet | @@ -7,7 +7,7 @@ Device Tree For Samsung Galaxy S3 Neo | CHIPSET | Qualcomm Snapdragon 400 | | GPU | Adreno 305 | | Memory | 1.5GB RAM | -| Shipped Android Version | 4.4.2 | +| Shipped Android Version | 4.4.4 | | Storage | 16GB | | MicroSD | Up to 64GB | | Battery | 2100 mAh | @@ -15,4 +15,4 @@ Device Tree For Samsung Galaxy S3 Neo | Camera | 8 MP, 3264 x 2448 pixels | -![Galaxy S3 Neo](http://cdn2.gsmarena.com/vv/pics/samsung/samsung-i9301l-galaxy-s3-neo.jpg "Galaxy S3 Neo") +![Galaxy S3 Neo](https://i-cdn.phonearena.com/images/phones/46349-xlarge/Samsun-Galaxy-Tab-4-10.1-3a.jpg "Galaxy S3 Neo") diff --git a/device-proprietary-files.txt b/device-proprietary-files.txt index a5c74e1..8d8cee3 100644 --- a/device-proprietary-files.txt +++ b/device-proprietary-files.txt @@ -1,37 +1 @@ -## GSM Blobs - Pinned to G900FXXS1BPCL_G900FOXA1BOJ1_BTU versions -# Radio -lib/libsec-ril.so:vendor/lib/libsec-ril.so|075570a628f465f92f3067afcefb6938d4e5dc3a - -# Samsung Camera Specific Blobs - Pinned to Samsung sensor specific files -lib/E08QL_libTsAe.so:vendor/lib/E08QL_libTsAe.so|b26488bba1d9a408794ffeef99b334d710abde69 -lib/E08QL_libTsAf.so:vendor/lib/E08QL_libTsAf.so|1cb71e8b40435075deaebe11faeb5e8e2b4a338f -lib/E08QL_libTs_J_Accm.so:vendor/lib/E08QL_libTs_J_Accm.so|25c0090e2c0e59488a2b05401b24efa6609e9e77 -lib/E08QL_libTs_J_Awb.so:vendor/lib/E08QL_libTs_J_Awb.so|5b96eef8ba294f0b58c20034599135660c8506a9 -lib/libmmcamera2_stats_algorithm.so:vendor/lib/libmmcamera2_stats_algorithm.so|b874bf52fa6071ea8bd114444bb734b8dd6a7a6e -lib/libmmcamera_fidelix_eeprom.so:vendor/lib/libmmcamera_fidelix_eeprom.so|e6d13ab8c745dfa33cbeb94c936c3e4807c34630 -vendor/lib/libmmcamera2_iface_modules.so|88e17a3f7ebb0dfa1ca93a8f1e53d541c000c136 -vendor/lib/libmmcamera2_imglib_modules.so|b965b187eee18b241474cc0257e2352f26c748fe -vendor/lib/libmmcamera2_isp_modules.so|f23bc7e54336375b0cbcda8e66a0146779fa9937 -vendor/lib/libmmcamera2_sensor_modules.so|cffd7b905fbb7faa1507a5916d72f213b13eb1b7 -vendor/lib/libmmcamera2_stats_modules.so|77cb73b4e890b3956f8a6b5add9a4b545041abe9 -vendor/lib/libmmcamera_imx175.so|0bd21a0f983f5ef35b60c0735ad6b32adde0d8a7 -vendor/lib/liboemcamera.so|fd4d66850813bea498b052294a76467d6c5b6e26 - -# Back Camera chromatix - Pinned to Samsung sensor specific files -vendor/lib/E08QL_libchromatix_s5k4h5yb_common.so|1da243da6be7c2ea88c3c2421309a18ebf893d17 -vendor/lib/E08QL_libchromatix_s5k4h5yb_common_res0.so|1f73e5e378b76343ac4e33a169afe66439749906 -vendor/lib/E08QL_libchromatix_s5k4h5yb_common_res1.so|1d6345e3de97844047a864a24f8404e72ef94b85 -vendor/lib/E08QL_libchromatix_s5k4h5yb_default_video.so|bd6e40dcdfc6dc52c020d6bd451bb385e05e1679 -vendor/lib/E08QL_libchromatix_s5k4h5yb_liveshot.so|41b4bada6467c3587f28f64cc806f92877c1c07d -vendor/lib/E08QL_libchromatix_s5k4h5yb_panorama.so|491e3b1377170e34b2b0b74f94397f3fa6d5beea -vendor/lib/E08QL_libchromatix_s5k4h5yb_preview.so|af96292723194caa22b08e6bf660b218bff39ffb -vendor/lib/E08QL_libchromatix_s5k4h5yb_snapshot.so|4dc4d0415a4e4b2e5eab4c16393a575e7dad2212 -vendor/lib/E08QL_libchromatix_s5k4h5yb_video_hd.so|2a2fde016784617cefabd8b1715d3451c11edbf4 -vendor/lib/E08QL_libchromatix_s5k4h5yb_zsl.so|5c4ee362c6dc6f452d6149c35ca766b1faab6709 -vendor/lib/E08QL_libchromatix_s5k4h5yb_zslshot.so|32b2ce964d6159a77cce79ab9b4d5aaba0094da6 - -# Samsung Camera chromatix specific blobs - Pinned to Samsung sensor specific files -lib/libTs_J_Awb.so:vendor/lib/libTs_J_Awb.so|5b96eef8ba294f0b58c20034599135660c8506a9 - -# Firmware -etc/E08QL_s5k4h5yb_module_info.xml +# No Blobs diff --git a/device.mk b/device.mk index eb60d99..193e1fd 100644 --- a/device.mk +++ b/device.mk @@ -17,14 +17,19 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) +# Permissions +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml + +# IR Blaster +PRODUCT_PACKAGES += \ + android.hardware.ir@1.0-service \ + android.hardware.ir@1.0-impl \ + consumerir.default \ + consumerir.msm8226 + # Get non-open-source specific aspects -$(call inherit-product-if-exists, vendor/samsung/s3ve3gjv/s3ve3gjv-vendor.mk) +$(call inherit-product-if-exists, vendor/samsung/matissewifi/matissewifi-vendor.mk) -# Overlays -DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay - -# NFC -# $(call inherit-product, device/samsung/s3ve3g-common/nfc/pn547/product.mk) - -# common s3ve3g -$(call inherit-product, device/samsung/s3ve3g-common/s3ve3g.mk) +# common matisse +$(call inherit-product, device/samsung/matisse-common/matisse.mk) diff --git a/extract-files.sh b/extract-files.sh index 4bc7cd1..def15ba 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -17,8 +17,8 @@ set -e -export DEVICE=s3ve3gjv -export DEVICE_COMMON=s3ve3g-common +export DEVICE=matissewifi +export DEVICE_COMMON=matisse-common export VENDOR=samsung ./../$DEVICE_COMMON/extract-files.sh $@ diff --git a/full_s3ve3gjv.mk b/full_matissewifi.mk similarity index 75% rename from full_s3ve3gjv.mk rename to full_matissewifi.mk index e732852..922831e 100644 --- a/full_s3ve3gjv.mk +++ b/full_matissewifi.mk @@ -13,14 +13,14 @@ # limitations under the License. # Inherit from those products. Most specific first. -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) -# Inherit from s3ve3g device -$(call inherit-product, device/samsung/s3ve3gjv/device.mk) +# Inherit from matissewifi device +$(call inherit-product, device/samsung/matissewifi/device.mk) # Set those variables here to overwrite the inherited values. -PRODUCT_NAME := full_s3ve3gjv -PRODUCT_DEVICE := s3ve3gjv +PRODUCT_NAME := full_matissewifi +PRODUCT_DEVICE := matissewifi PRODUCT_BRAND := samsung PRODUCT_MANUFACTURER := samsung -PRODUCT_MODEL := s3ve3gjv +PRODUCT_MODEL := matissewifi diff --git a/init/init_matisse.cpp b/init/init_matisse.cpp new file mode 100755 index 0000000..e12997f --- /dev/null +++ b/init/init_matisse.cpp @@ -0,0 +1,91 @@ +/* + Copyright (c) 2016, The Linux Foundation. All rights reserved. + Copyright (c) 2017-2018, The LineageOS Project. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +#include +#include + +#include "property_service.h" +#include "vendor_init.h" + +#include "init_msm8226.h" + +using android::base::GetProperty; +using android::init::property_set; + +void gsm_properties() +{ + property_set("ro.carrier", "wifi-only"); + property_set("ro.radio.noril", "1"); +} + +void init_target_properties() +{ + std::string platform = GetProperty("ro.board.platform", ""); + if (platform != ANDROID_TARGET) + return; + + std::string bootloader = GetProperty("ro.bootloader", ""); + if (bootloader.find("T530NU") == 0) { + /* matissewifiue */ + property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/matissewifiue/matissewifi:5.0.2/LRX22G/T530NUU1BOJ4:user/release-keys"); + property_override("ro.build.description", "matissewifiue-user 5.0.2 LRX22G T530NUU1BOJ4 release-keys"); + property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-T530NU"); + property_override_dual("ro.product.device", "ro.vendor.product.device", "matissewifi"); + gsm_properties(); + } else if (bootloader.find("T530XX") == 0) { + /* matissewifixx */ + property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/matissewifixx/matissewifi:5.0.2/LRX22G/T530XXU1BOJ4:user/release-keys"); + property_override("ro.build.description", "matissewifixx-user 5.0.2 LRX22G T530XXU1BOJ4 release-keys"); + property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-T530"); + property_override_dual("ro.product.device", "ro.vendor.product.device", "matissewifi"); + gsm_properties(); + } else if (bootloader.find("T531XX") == 0) { + /* matisse3gxx */ + property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/matisse3gxx/matisse3g:5.0.2/LRX22G/T531XXU1BOE6:user/release-keys"); + property_override("ro.build.description", "matisse3gxx-user 5.0.2 LRX22G T531XXU1BOE6 release-keys"); + property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-T531"); + property_override_dual("ro.product.device", "ro.vendor.product.device", "matisse3g"); + } else if (bootloader.find("T535XX") == 0) { + /* matisseltexx */ + property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/matisseltexx/matisselte:5.0.2/LRX22G/T535XXU1BOL1:user/release-keys"); + property_override("ro.build.description", "matisseltexx-user 5.0.2 LRX22G T535XXU1BOL1 release-keys"); + property_override_dual("ro.product.model", "ro.vendor.product.model", "SM-T535"); + property_override_dual("ro.product.device", "ro.vendor.product.device", "matisselte"); + } else { + gsm_properties(); + } + + std::string device = GetProperty("ro.product.device", ""); + LOG(ERROR) << "Found bootloader id " << bootloader << " setting build properties for " + << device << " device" << std::endl; +} diff --git a/init/init_s3ve3g.cpp b/init/init_s3ve3g.cpp deleted file mode 100755 index 1637a6c..0000000 --- a/init/init_s3ve3g.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - Copyright (c) 2016, The Linux Foundation. All rights reserved. - Copyright (c) 2017-2018, The LineageOS Project. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of The Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include - -#include -#include - -#include "property_service.h" -#include "vendor_init.h" - -#include "init_msm8226.h" - -using android::base::GetProperty; -using android::init::property_set; - -void gsm_properties() -{ - property_set("ro.telephony.default_network", "3"); - property_set("telephony.lteOnGsmDevice", "0"); -} - -void init_target_properties() -{ - std::string platform = GetProperty("ro.board.platform", ""); - if (platform != ANDROID_TARGET) - return; - - std::string bootloader = GetProperty("ro.bootloader", ""); - - if (bootloader.find("I9301I") == 0) { - /* s3ve3gds */ - property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/s3ve3gds/s3ve3g:4.4.2/KOT49H/I9301IXXUANL1:user/release-keys"); - property_override("ro.build.description", "s3ve3gds-user 4.4.2 KOT49H I9301IXXUANL1 release-keys"); - property_override_dual("ro.product.model", "ro.vendor.product.model", "GT-I9301I"); - property_override_dual("ro.product.device", "ro.vendor.product.device", "s3ve3g"); - gsm_properties(); - } else if (bootloader.find("I9301Q") == 0) { - /* s3ve3gjv */ - property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/s3ve3gjv/s3ve3g:4.4.2/KOT49H/I9301QXXUANH1:user/release-keys"); - property_override("ro.build.description", "samsung/s3ve3gjv/s3ve3g:4.4.2/KOT49H/I9301QXXUANH1:user/release-keys"); - property_override_dual("ro.product.model", "ro.vendor.product.model", "GT-I9301Q"); - property_override_dual("ro.product.device", "ro.vendor.product.device", "s3ve3gjv"); - gsm_properties(); - } else if (bootloader.find("I9300I") == 0) { - /* s3ve3gdsds */ - property_override_dual("ro.build.fingerprint", "ro.vendor.build.fingerprint", "samsung/s3ve3gdsxx/s3ve3gds:4.4.4/KTU84P/I9300IXWUBNJ1:user/release-keys"); - property_override("ro.build.description", "s3ve3gdsxx-user 4.4.4 KTU84P I9300IXWUBNJ1 release-keys"); - property_override_dual("ro.product.model", "ro.vendor.product.model", "GT-I9300I"); - property_override_dual("ro.product.device", "ro.vendor.product.device", "s3ve3gds"); - gsm_properties(); - } else { - gsm_properties(); - } - - std::string device = GetProperty("ro.product.device", ""); - LOG(ERROR) << "Found bootloader id " << bootloader << " setting build properties for " - << device << " device" << std::endl; -} diff --git a/lineage.dependencies b/lineage.dependencies index 93f8841..9c39d56 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,6 +1,6 @@ [ { - "repository": "android_device_samsung_s3ve3g-common", - "target_path": "device/samsung/s3ve3g-common" + "repository": "android_device_samsung_matisse-common", + "target_path": "device/samsung/matisse-common" } ] diff --git a/lineage_s3ve3gjv.mk b/lineage_matissewifi.mk similarity index 75% rename from lineage_s3ve3gjv.mk rename to lineage_matissewifi.mk index 975bc19..7eddc1a 100644 --- a/lineage_s3ve3gjv.mk +++ b/lineage_matissewifi.mk @@ -16,9 +16,10 @@ # # Inherit some common LineageOS stuff. -$(call inherit-product, vendor/lineage/config/common_full_phone.mk) +$(call inherit-product, vendor/lineage/config/common_full_tablet_wifionly.mk) -$(call inherit-product, device/samsung/s3ve3gjv/full_s3ve3gjv.mk) -PRODUCT_DEVICE := s3ve3gjv -PRODUCT_NAME := lineage_s3ve3gjv +$(call inherit-product, device/samsung/matissewifi/full_matissewifi.mk) + +PRODUCT_DEVICE := matissewifi +PRODUCT_NAME := lineage_matissewifi diff --git a/manifest.xml b/manifest.xml new file mode 100644 index 0000000..e142e00 --- /dev/null +++ b/manifest.xml @@ -0,0 +1,11 @@ + + + android.hardware.ir + passthrough + 1.0 + + IConsumerIr + default + + + diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml deleted file mode 100644 index bb73f8a..0000000 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - CDMA|EVDO|GSM|WCDMA - diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 86231a0..4180dea 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -17,8 +17,8 @@ set -e -export DEVICE=s3ve3gjv -export DEVICE_COMMON=s3ve3g-common +export DEVICE=matissewifi +export DEVICE_COMMON=matisse-common export VENDOR=samsung ./../$DEVICE_COMMON/setup-makefiles.sh $@ diff --git a/vendorsetup.sh b/vendorsetup.sh index 26b6f21..4565f8c 100644 --- a/vendorsetup.sh +++ b/vendorsetup.sh @@ -1,2 +1,2 @@ -add_lunch_combo lineage_s3ve3gjv-eng -add_lunch_combo lineage_s3ve3gjv-userdebug +add_lunch_combo lineage_matissewifi-eng +add_lunch_combo lineage_matissewifi-userdebug