d1x: Adapt from d1
Change-Id: I579e4d6a32bd69115d3e7b8ca83e9dc2b62f0646
diff --git a/Android.mk b/Android.mk
index 5e7b3d8..844ae26 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,6 @@
LOCAL_PATH := $(call my-dir)
-ifneq ($(filter d1, $(TARGET_DEVICE)),)
+ifneq ($(filter d1x, $(TARGET_DEVICE)),)
include $(call all-subdir-makefiles,$(LOCAL_PATH))
endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 58dae1f..bdbc36c 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -15,9 +15,9 @@
#
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/lineage_d1.mk
+ $(LOCAL_DIR)/lineage_d1x.mk
COMMON_LUNCH_CHOICES := \
- lineage_d1-eng \
- lineage_d1-user \
- lineage_d1-userdebug
+ lineage_d1x-eng \
+ lineage_d1x-user \
+ lineage_d1x-userdebug
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6fc5d58..0de212b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -17,15 +17,15 @@
include device/samsung/exynos9820-common/BoardConfig9825.mk
## Inherit from the proprietary configuration
-include vendor/samsung/d1/BoardConfigVendor.mk
+include vendor/samsung/d1x/BoardConfigVendor.mk
-DEVICE_PATH := device/samsung/d1
+DEVICE_PATH := device/samsung/d1x
## Display
TARGET_SCREEN_DENSITY := 420
## Kernel
-TARGET_KERNEL_CONFIG := exynos9820-d1_defconfig
+TARGET_KERNEL_CONFIG := exynos9820-d1x_defconfig
## Properties
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
diff --git a/configs/audio/mixer_paths.xml b/configs/audio/mixer_paths.xml
index fe5f9e8..2735982 100644
--- a/configs/audio/mixer_paths.xml
+++ b/configs/audio/mixer_paths.xml
@@ -3996,6 +3996,21 @@
<ctl name="IN4R Digital Volume" value="131" />
</path>
+ <!-- Karaoke Listenback MIC paths -->
+ <path name="gain-listenback-mic">
+ <ctl name="IN3R Digital Volume" value="116" />
+ </path>
+
+ <path name="gain-listenback-usb-headset-mic">
+ </path>
+
+ <path name="gain-listenback-bt-sco-headset-in">
+ </path>
+
+ <path name="gain-listenback-headphone-mic">
+ <ctl name="IN3R Digital Volume" value="116" />
+ </path>
+
<!-- camcorder input volume -->
<path name="gain-camcorder-mic">
<path name="gain-media-mic" />
@@ -4878,15 +4893,15 @@
<!-- echo(rms) test input volume -->
<path name="gain-echo_test-mic">
- <ctl name="IN3R Digital Volume" value="135" />
+ <ctl name="IN3R Digital Volume" value="137" />
</path>
<path name="gain-echo_test-2nd-mic">
- <ctl name="IN4R Digital Volume" value="129" />
+ <ctl name="IN4R Digital Volume" value="127" />
</path>
<path name="gain-echo_test-3rd-mic">
- <ctl name="IN1R Digital Volume" value="165" />
+ <ctl name="IN1R Digital Volume" value="150" />
</path>
<path name="gain-echo_test-dualmic">
diff --git a/device.mk b/device.mk
index 1ead241..9a24351 100644
--- a/device.mk
+++ b/device.mk
@@ -18,7 +18,7 @@
$(call inherit-product, device/samsung/exynos9820-common/exynos9825.mk)
# Inherit proprietary files
-$(call inherit-product, vendor/samsung/d1/d1-vendor.mk)
+$(call inherit-product, vendor/samsung/d1x/d1x-vendor.mk)
# Setup dalvik vm configs
$(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
diff --git a/extract-files.sh b/extract-files.sh
index 19aa7ec..53d5c65 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -31,7 +31,7 @@
set -e
-export DEVICE=d1
+export DEVICE=d1x
export DEVICE_COMMON=exynos9820-common
export VENDOR=samsung
diff --git a/lineage_d1.mk b/lineage_d1x.mk
similarity index 89%
rename from lineage_d1.mk
rename to lineage_d1x.mk
index 9a4144b..e076b05 100644
--- a/lineage_d1.mk
+++ b/lineage_d1x.mk
@@ -28,8 +28,8 @@
## S Pen
TARGET_HAVE_SPEN := true
-## Inherit from d1 device
-$(call inherit-product, device/samsung/d1/device.mk)
+## Inherit from d1x device
+$(call inherit-product, device/samsung/d1x/device.mk)
## Boot Animation
TARGET_BOOTANIMATION_HALF_RES := true
@@ -40,10 +40,10 @@
$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
## Device identifier, this must come after all inclusions
-PRODUCT_NAME := lineage_d1
-PRODUCT_DEVICE := d1
+PRODUCT_NAME := lineage_d1x
+PRODUCT_DEVICE := d1x
PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-N970F
+PRODUCT_MODEL := SM-N971N
PRODUCT_MANUFACTURER := samsung
PRODUCT_GMS_CLIENTID_BASE := android-samsung
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 8006a36..232e4b0 100644
--- a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -18,5 +18,5 @@
-->
<resources>
<!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
- <string name="def_device_name_simple">Galaxy Note10</string>
+ <string name="def_device_name_simple">Galaxy Note10 5G</string>
</resources>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index dcb9006..d133001 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# Proprietary files - from Samsung package version N970FXXS9HWHA, unless pinned
+# Proprietary files - from Samsung package version N971NKSU2HWH5, unless pinned
## Audio - Dolby Atmos
vendor/etc/dolby/dax-default.xml
@@ -24,9 +24,9 @@
vendor/firmware/bcm4375B1_semco.hcd
vendor/firmware/bcm4375B1_semco_sem.hcd
-## Camera - from d1 - N970FXXS7GVB1
+## Camera - from d1x - N971NKSU2GULF
-vendor/lib64/hw/camera.exynos9825.so|63a55d3796921c03c331a63fa57cd17987442677
--vendor/lib64/libexynoscamera3.so|dba359984d33b5f5c5be532aa28cb4f029773c19
+-vendor/lib64/libexynoscamera3.so|3a4fed71f0b1488303a16fa2b35be67d620153cd
## Camera Firmware
vendor/firmware/fimc_is_fw_mcu.bin
diff --git a/proprietary-firmware.txt b/proprietary-firmware.txt
index eb51cec..3567ec8 100644
--- a/proprietary-firmware.txt
+++ b/proprietary-firmware.txt
@@ -1,16 +1,18 @@
-# Firmware for model SM-N970F - from Samsung package version N970FXXS9HWHA
+# Firmware for model SM-N971N - from Samsung package version N971NKSU2HWH5
-cm.bin_SM-N970F
-dqmdbg.img_SM-N970F
-keystorage.bin_SM-N970F
-modem.bin_SM-N970F
-modem_debug.bin_SM-N970F
-param.bin_SM-N970F
-sboot.bin_SM-N970F
-uh.bin_SM-N970F
-up_param.bin_SM-N970F
+cm.bin_SM-N971N
+dqmdbg.img_SM-N971N
+keystorage.bin_SM-N971N
+modem.bin_SM-N971N
+modem_5g.bin_SM-N971N
+modem_debug.bin_SM-N971N
+modem_debug_5g.bin_SM-N971N
+param.bin_SM-N971N
+sboot.bin_SM-N971N
+uh.bin_SM-N971N
+up_param.bin_SM-N971N
# File containing the supported models, one per line
models
# Files containing Samsung package version for supported models
-version_SM-N970F
+version_SM-N971N
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index d33db03..d06e94f 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -14,7 +14,7 @@
set -e
-export DEVICE=d1
+export DEVICE=d1x
export DEVICE_COMMON=exynos9820-common
export VENDOR=samsung
diff --git a/vendor.prop b/vendor.prop
index 27f1332..2b3830c 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,5 +1,5 @@
## Bluetooth
-bluetooth.device.default_name=Galaxy Note10
+bluetooth.device.default_name=Galaxy Note10 5G
## Fingerprint
ro.vendor.fingerprint.type=udfps
@@ -7,4 +7,4 @@
ro.vendor.fingerprint.force_calibrate=true
## RIL
-ro.telephony.default_network=9,9
+ro.telephony.default_network=26