From 20fa9b2dff887828d51428bc69592de5270a93b9 Mon Sep 17 00:00:00 2001
From: sjllls <2012ji123@gmail.com>
Date: Mon, 10 May 2021 15:55:09 +0800
Subject: [PATCH] akatsuki: Initial commit
Change-Id: I9567f90a91fd558d5ff80baa9fe49ed2e11a2bf8
---
Android.mk | 2 +-
AndroidProducts.mk | 8 +-
BoardConfig.mk | 17 +-
README.md | 47 +-
audio/audio_platform_info.xml | 8 +-
audio/audio_policy_volumes.xml | 0
audio/default_volume_tables.xml | 0
audio/mixer_paths_tavil.xml | 62 +--
audio/sound_trigger_mixer_paths_wcd9340.xml | 0
audio/sound_trigger_platform_info.xml | 0
configs/thermal-engine.conf | 285 ++++++-----
device.mk | 15 +-
extract-files.sh | 4 +-
idc/sidekey_dev.idc | 6 +
idc/synaptics_tcm_touch.idc | 41 --
idc/{clearpad.idc => touch_dev.idc} | 2 +-
keylayout/gpio-keys.kl | 0
lineage_akatsuki.mk | 26 +
lineage_xz2c.mk | 26 -
manifest.xml | 3 +-
nfc/libnfc-nxp.conf | 0
.../base/core/res/res/values/config.xml | 46 +-
.../base/core/res/res/xml/power_profile.xml | 18 +-
.../SettingsProvider/res/values/defaults.xml | 24 +
proprietary-files.txt | 448 +++++++++---------
setup-makefiles.sh | 4 +-
system.prop | 16 +-
vendor.prop | 5 +-
28 files changed, 591 insertions(+), 522 deletions(-)
mode change 100644 => 100755 audio/audio_platform_info.xml
mode change 100644 => 100755 audio/audio_policy_volumes.xml
mode change 100644 => 100755 audio/default_volume_tables.xml
mode change 100644 => 100755 audio/mixer_paths_tavil.xml
mode change 100644 => 100755 audio/sound_trigger_mixer_paths_wcd9340.xml
mode change 100644 => 100755 audio/sound_trigger_platform_info.xml
mode change 100644 => 100755 configs/thermal-engine.conf
create mode 100755 idc/sidekey_dev.idc
delete mode 100644 idc/synaptics_tcm_touch.idc
rename idc/{clearpad.idc => touch_dev.idc} (66%)
mode change 100644 => 100755
mode change 100644 => 100755 keylayout/gpio-keys.kl
create mode 100644 lineage_akatsuki.mk
delete mode 100644 lineage_xz2c.mk
mode change 100644 => 100755 nfc/libnfc-nxp.conf
mode change 100644 => 100755 overlay/frameworks/base/core/res/res/xml/power_profile.xml
create mode 100644 overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
diff --git a/Android.mk b/Android.mk
index 9893cfe..9379fb9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,7 +15,7 @@
LOCAL_PATH := $(call my-dir)
-ifeq ($(TARGET_DEVICE),xz2c)
+ifeq ($(TARGET_DEVICE),akatsuki)
subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 671446a..4958100 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -14,9 +14,9 @@
# limitations under the License.
PRODUCT_MAKEFILES := \
- $(LOCAL_DIR)/lineage_xz2c.mk
+ $(LOCAL_DIR)/lineage_akatsuki.mk
COMMON_LUNCH_CHOICES := \
- lineage_xz2c-user \
- lineage_xz2c-userdebug \
- lineage_xz2c-eng
+ lineage_akatsuki-user \
+ lineage_akatsuki-userdebug \
+ lineage_akatsuki-eng
diff --git a/BoardConfig.mk b/BoardConfig.mk
index a420519..2a386df 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -7,32 +7,27 @@
# Inherit from tama-common
-include device/sony/tama-common/BoardConfigCommon.mk
-DEVICE_PATH := device/sony/xz2c
+DEVICE_PATH := device/sony/akatsuki
# Assert
-TARGET_OTA_ASSERT_DEVICE := H8314,H8324,apollo,apollo_dual,xz2c,xz2c_dual
-
-# Crypto
-TARGET_HW_DISK_ENCRYPTION := true
+TARGET_OTA_ASSERT_DEVICE := H8416,H9493,H9436,akatsuki,akatsuki_dual
# Display
TARGET_SCREEN_DENSITY := 480
# Kernel
-TARGET_KERNEL_CONFIG := tama_apollo_defconfig
+TARGET_KERNEL_CONFIG := tama_akatsuki_defconfig
# HIDL
DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
# Partitions
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 51448807424
+# Reserve space for data encryption (44712771584-16384)
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 44712755200
# Properties
TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
-# Treble
-BOARD_VNDK_RUNTIME_DISABLE := true
-
# Inherit from the proprietary version
--include vendor/sony/xz2c/BoardConfigVendor.mk
+-include vendor/sony/akatsuki/BoardConfigVendor.mk
diff --git a/README.md b/README.md
index 0507824..e0f57ee 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,35 @@
-Copyright (C) 2019 The LineageOS Project
+# Device Tree for Xperia XZ3 (akatsuki)
+The Xperia (codenamed _"akatsuki"_) is a smartphone from Sony Mobile.
+It was released in 2018.
-Device configuration for Sony Xperia XZ2 Compact
-=========================================
+| Basic | Spec Sheet |
+| -----------------------:|:------------------------------------------------------------------------------------------------------------------------------ |
+| CPU | Octa-core (4x2.8 GHz Kryo 385 Gold & 4x1.7 GHz Kryo 385 Silver) |
+| Chipset | Qualcomm SDM845 Snapdragon 845 |
+| GPU | Adreno 630 |
+| Memory | 4/6 GB RAM |
+| Shipped Android Version | 9.0 |
+| Storage | 64 GB |
+| Battery | Non-removable Li-Po 3300 mAh battery |
+| Display | Toppest p-OLED, 1440 x 2880 pixels, 18:9 ratio (~537 ppi density) |
+| Camera (Back) | 19 MP (f/2.0, 25mm, 1/2.3", 1.22 µm), gyro EIS, predictive phase detection and laser AF, LED flash, 4K at 30fps, 1080p at 30, 60fps or 960fps |
+| Camera (Front) | 13 MP (f/1.9, 1/3.1"), gyro EIS, 1080p |
-The Sony Xperia XZ2 Compact (codenamed _"apollo"_) is a high-end smartphone from Sony.
+Copyright 2018 - The LineageOS Project.
-It was announced in July 2019. Release date was August 2019.
+
-## Device specifications
-Basic | Spec Sheet
--------:|:-------------------------
-SoC | Qualcomm SDM845 Snapdragon 845
-CPU | Octa-core (4x2.8 GHz Kryo 385 Gold & 4x1.8 GHz Kryo 385 Silver)
-GPU | Adreno 630
-Memory | 4 GB RAM
-Shipped Android Version | 8.0
-Storage | 64 GB
-Battery | Non-removable Li-Ion 3400 mAh battery
-Display | 1080 x 2160 pixels, 18:9 ratio, 5.99 inches, IPS LCD (~403 ppi density)
-Camera | Dual 12 MP, 4-axis OIS, 2x optical zoom, dual PDAF, dual-LED (dual tone) flash
+## Temporary build instructions
-## Device picture
+```
+# Compiling
+$ m[ake|ka] bootimage systemimage
+
+# Installing
+$ fastboot --disable-verity --disable-verification flash vbmeta stock_vbmeta.img
+$ fastboot flash boot boot.img
+$ fastboot flash system system.img
+$ fastboot -w reboot
+```
-
diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
old mode 100644
new mode 100755
index f1b9215..60329d7
--- a/audio/audio_platform_info.xml
+++ b/audio/audio_platform_info.xml
@@ -235,13 +235,13 @@
+ responses="-0.88 -0.89 -0.90 -0.91 -0.92 -0.93 -0.94 -0.95 -0.96 -0.97 -0.98 -0.99 -0.98 -0.97 -0.95 -0.94 -0.93 -0.92 -0.91 -0.74 -0.61 -0.45 -0.30 -0.16 -0.53 -0.88 -1.21 -1.39 -1.18 -0.95 -0.73 -0.24 0.11 0.32 0.07 -0.16 0.07 0.24 0.06 -0.05 -0.02 -0.09 -0.26 -0.38 0.30 1.55 -0.76 -0.91 -0.76 -0.86 -1.00 -1.15 -1.79 -3.05 -4.27 -4.67 -3.34 -2.74 0.49 2.53 1.19 -0.81 -1.46 -0.87 0.19 -0.86 -2.45 -3.51 -0.89 0.87 -0.65 -0.80 -0.22 -1.85 -1.70 0.70 -3.83 -1.98 -2.88 -2.97 -2.33 -1.79 -1.14 -0.52 0.17 1.56 1.85 -2.77 -0.23 1.55 -1.01 -1.28 3.80"
+ sensitivity="-37.0" max_spl="130.0" min_spl="29.0" orientation="0.0 -1.0 0.0" geometric_location="0.02274 0.000287 0.006596" />
+ responses="-1.67 -1.59 -1.52 -1.44 -1.37 -1.29 -1.21 -1.12 -1.03 -0.94 -0.87 -0.81 -0.80 -0.78 -0.77 -0.76 -0.75 -0.73 -0.72 -0.87 -0.98 -1.13 -1.26 -1.39 -1.10 -0.83 -0.58 -0.42 -0.48 -0.55 -0.61 -0.81 -0.95 -0.84 -0.19 0.42 -0.16 -0.65 -0.76 -0.72 -0.27 -0.16 -0.49 -0.94 -0.96 -0.58 -1.90 -2.29 -2.45 -1.46 -0.96 -0.72 -0.65 -1.05 -0.74 -2.17 -1.11 -1.86 1.02 1.77 -0.17 -2.27 -2.21 0.20 1.69 1.42 0.76 0.43 1.76 2.35 0.46 1.17 2.35 1.35 0.61 2.50 4.23 4.63 2.80 4.02 4.14 4.62 4.11 3.72 1.99 0.99 2.35 7.30 4.30 2.20 3.83 1.27 1.61"
+ sensitivity="-37.0" max_spl="130.0" min_spl="29.0" orientation="0.0 1.0 0.0" geometric_location="0.04769 0.157736 0.007065" />
diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml
old mode 100644
new mode 100755
diff --git a/audio/default_volume_tables.xml b/audio/default_volume_tables.xml
old mode 100644
new mode 100755
diff --git a/audio/mixer_paths_tavil.xml b/audio/mixer_paths_tavil.xml
old mode 100644
new mode 100755
index a1df28a..23d16b0
--- a/audio/mixer_paths_tavil.xml
+++ b/audio/mixer_paths_tavil.xml
@@ -2098,31 +2098,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -2167,7 +2167,7 @@
-
+
@@ -2212,8 +2212,8 @@
-
-
+
+
@@ -2631,8 +2631,8 @@
-
-
+
+
@@ -3289,8 +3289,8 @@
-
-
+
+
diff --git a/audio/sound_trigger_mixer_paths_wcd9340.xml b/audio/sound_trigger_mixer_paths_wcd9340.xml
old mode 100644
new mode 100755
diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml
old mode 100644
new mode 100755
diff --git a/configs/thermal-engine.conf b/configs/thermal-engine.conf
old mode 100644
new mode 100755
index 9b77349..49f82d9
--- a/configs/thermal-engine.conf
+++ b/configs/thermal-engine.conf
@@ -1,168 +1,208 @@
-[msm-therm-adc_0.DEFAULT]
+[ufs_therm_0.DEFAULT]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds 44000 44400 45500 46900 47500 48000 48700 50500
-thresholds_clr 43000 44000 44400 45500 46900 47500 48000 48700
+thresholds 45400 46400 47400 48200 49000 49700 50500 51000
+thresholds_clr 44400 45400 46400 47400 48200 49000 49700 50500
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2553600+0+0+0+0+710000000+255+3+100000+0 1766400+2400000+0+0+0+1+710000000+228+3+100000+0 1766400+2323200+0+0+0+1+710000000+207+5+100000+0 1766400+2246400+0+0+1+1+710000000+177+5+003600+0 1766400+2092800+0+0+1+1+710000000+153+7+003600+0 1766400+1843200+0+0+1+1+710000000+130+7+003600+0 1766400+1536000+0+1+1+1+710000000+116+9+001800+0 1766400+1209600+0+1+1+1+710000000+86+10+001800+0
+action_info 1766400+2649600+0+0+0+0+710000000+255+1+100000+0 1766400+2400000+0+0+0+0+710000000+230+2+100000+0 1766400+2169600+0+0+0+0+710000000+200+3+100000+0 1766400+1920000+0+0+0+1+710000000+190+6+100000+0 1766400+1689600+0+0+0+1+710000000+170+6+100000+0 1766400+1459200+0+0+0+1+710000000+155+6+100000+0 1766400+1363200+0+0+1+1+710000000+135+7+003600+0 1766400+1209600+0+0+1+1+710000000+120+8+003600+0
-[msm-therm-adc_1.DEFAULT]
+[ufs_therm_1.DEFAULT]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds 51500 52000 52500 53000 53500 54000 54500 55000
-thresholds_clr 50500 51500 52000 52500 53000 53500 54000 54500
+thresholds 51400 52300 53200 54000 54700 56100 58100 60500
+thresholds_clr 51000 51400 52300 53200 54000 54700 56100 58100
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+979200+0+1+1+1+710000000+54+11+001800+0 1766400+902400+0+1+1+1+710000000+54+11+001800+0 1766400+825600+1+1+1+1+710000000+54+11+001800+0 1516800+825600+1+1+1+1+520000000+43+11+001800+0 1324800+825600+1+1+1+1+520000000+43+11+001800+0 1056000+825600+1+1+1+1+520000000+43+11+000010+6 825600+825600+1+1+1+1+414000000+43+11+000010+6 652800+825600+1+1+1+1+414000000+43+11+000010+6
+action_info 1766400+1209600+0+1+1+1+710000000+110+10+003600+0 1766400+1056000+0+1+1+1+596000000+100+10+001800+5 1766400+979200+0+1+1+1+596000000+80+10+001800+5 1766400+825600+1+1+1+1+414000000+55+10+001800+6 1516800+825600+1+1+1+1+257000000+55+11+001800+6 1228800+825600+1+1+1+1+257000000+55+11+001800+6 902400+825600+1+1+1+1+257000000+55+11+001800+6 480000+825600+1+1+1+1+257000000+55+11+001800+6
-[msm-therm-adc_2.DEFAULT]
+[ufs_therm_2.DEFAULT]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds 55500 57500
-thresholds_clr 55000 55500
-actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 480000+825600+1+1+1+1+342000000+43+12+000010+6 300000+825600+1+1+1+1+257000000+43+14+000010+6
+thresholds 63400
+thresholds_clr 60500
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 300000+825600+1+1+1+1+257000000+36+14+000010+6
-[msm-therm-adc_0.CAMERA-Preview]
+[ufs_therm_0.CAMERA-Preview]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds -100000 44000 44400 45500 46900 47500 48000 48700
-thresholds_clr -110000 43000 44000 44400 45500 46900 47500 48000
+thresholds -100000 48200 49000 49700 50500 51200 51800 52300
+thresholds_clr -110000 47400 48200 49000 49700 50500 51200 51800
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2649600+0+0+0+0+675000000+142+9+100000+0 1766400+2649600+0+0+0+0+675000000+140+9+100000+0 1766400+2649600+0+0+0+0+675000000+134+9+100000+0 1766400+2649600+0+0+0+0+675000000+120+10+100000+0 1766400+2649600+0+0+0+0+675000000+113+10+003600+0 1766400+2649600+0+0+0+0+675000000+113+11+003600+0 1766400+2649600+0+0+0+0+675000000+95+12+003600+0 1766400+2649600+0+0+0+0+675000000+80+12+001800+0
+action_info 1766400+2649600+0+0+0+0+675000000+148+7+100000+0 1766400+2400000+0+0+0+0+675000000+148+7+100000+0 1766400+2169600+0+0+0+0+675000000+125+8+100000+0 1766400+1920000+0+0+0+1+675000000+125+8+100000+0 1766400+1689600+0+0+0+1+675000000+105+9+100000+1 1766400+1459200+0+0+0+1+675000000+105+9+003600+1 1766400+1363200+0+0+1+1+675000000+85+9+003600+1 1766400+1209600+0+0+1+1+675000000+85+9+003600+1
disable
-[msm-therm-adc_1.CAMERA-Preview]
+[ufs_therm_1.CAMERA-Preview]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds 50500 51500 52000 52500 53000 53500 54000 54500
-thresholds_clr 48700 50500 51500 52000 52500 53000 53500 54000
-actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2649600+0+0+0+0+675000000+78+12+001800+1 1766400+2649600+0+0+0+0+675000000+75+12+001800+1 1766400+2649600+0+0+0+0+675000000+75+12+001800+5 1766400+2649600+0+0+0+0+675000000+74+12+001800+5 1766400+2649600+0+0+0+0+675000000+73+12+001800+5 1766400+2649600+0+0+0+0+675000000+43+12+001800+5 1766400+825600+1+1+1+1+675000000+43+12+000010+6 300000+825600+1+1+1+1+257000000+43+14+000010+6
+thresholds 52900 53300 53500 53900 57600
+thresholds_clr 52300 52900 53300 53500 53900
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 1766400+1209600+0+1+1+1+675000000+65+10+003600+5 1766400+1056000+0+1+1+1+675000000+65+10+001800+5 1766400+979200+0+1+1+1+675000000+55+10+001800+5 1766400+825600+1+1+1+1+675000000+43+11+001800+6 300000+825600+1+1+1+1+257000000+36+14+000010+6
disable
-[msm-therm-adc_0.CAMERA-Step]
+[ufs_therm_0.CAMERA-Step]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds -100000 44000 44400 45500 46900 47500 48000 48700
-thresholds_clr -110000 43000 44000 44400 45500 46900 47500 48000
+thresholds -100000 48200 49000 49700 50500 51200 51800 52300
+thresholds_clr -110000 47400 48200 49000 49700 50500 51200 51800
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2649600+0+0+0+0+710000000+142+9+100000+0 1766400+2649600+0+0+0+0+710000000+140+9+100000+0 1766400+2649600+0+0+0+0+710000000+134+9+100000+0 1766400+2649600+0+0+0+0+710000000+120+10+100000+0 1766400+2649600+0+0+0+0+710000000+113+10+003600+0 1766400+2649600+0+0+0+0+710000000+113+11+003600+0 1766400+2649600+0+0+0+0+710000000+95+12+003600+0 1766400+2649600+0+0+0+0+710000000+80+12+001800+0
+action_info 1766400+2649600+0+0+0+0+710000000+148+7+100000+0 1766400+2400000+0+0+0+0+710000000+148+7+100000+0 1766400+2169600+0+0+0+0+710000000+125+8+100000+0 1766400+1920000+0+0+0+1+710000000+125+8+100000+0 1766400+1689600+0+0+0+1+710000000+105+9+100000+0 1766400+1459200+0+0+0+1+710000000+105+9+003600+0 1766400+1363200+0+0+1+1+710000000+85+9+003600+0 1766400+1209600+0+0+1+1+710000000+85+9+003600+0
disable
-[msm-therm-adc_1.CAMERA-Step]
+[ufs_therm_1.CAMERA-Step]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds 50500 51500 52000 52500 53000 53500 54000 54500
-thresholds_clr 48700 50500 51500 52000 52500 53000 53500 54000
-actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2649600+0+0+0+0+710000000+78+12+001800+1 1766400+2649600+0+0+0+0+710000000+75+12+001800+1 1766400+2649600+0+0+0+0+710000000+75+12+001800+5 1766400+2649600+0+0+0+0+710000000+74+12+001800+5 1766400+2649600+0+0+0+0+710000000+73+12+001800+5 1766400+2649600+0+0+0+0+710000000+43+12+001800+5 1766400+825600+1+1+1+1+710000000+43+12+000010+6 300000+825600+1+1+1+1+257000000+43+14+000010+6
+thresholds 52800 53500 54200 56200 57600
+thresholds_clr 52300 52800 53500 54200 56200
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 1766400+1209600+0+1+1+1+710000000+65+10+003600+5 1766400+1056000+0+1+1+1+710000000+65+10+001800+5 1766400+979200+0+1+1+1+710000000+55+10+001800+5 1766400+825600+1+1+1+1+710000000+43+11+001800+6 300000+825600+1+1+1+1+257000000+36+14+000010+6
disable
-[msm-therm-adc_0.CAMERA-Low]
+[ufs_therm_0.CAMERA-Low]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds -100000 47000 48100 49500 50500 51000 52000 54000
-thresholds_clr -110000 46000 47000 48100 49500 50500 51000 52000
+thresholds -100000 46100 47200 48400 49600 50800 52000 54000
+thresholds_clr -110000 44900 46100 47200 48400 49600 50800 52000
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2649600+0+0+0+0+257000000+142+8+100000+0 1766400+2649600+0+0+0+0+257000000+142+10+003600+0 1766400+2649600+0+0+0+0+257000000+128+10+003600+0 1766400+2649600+0+0+0+0+257000000+95+10+001800+0 1766400+2649600+0+0+0+0+257000000+73+11+001800+0 1766400+2649600+0+0+0+0+257000000+56+12+001800+0 1766400+2649600+0+0+0+0+257000000+43+12+001800+5 1766400+2649600+0+0+0+0+257000000+43+12+000010+6
+action_info 1766400+2649600+0+0+0+0+257000000+148+9+100000+0 1766400+2649600+0+0+0+0+257000000+125+9+100000+0 1766400+2649600+0+0+0+0+257000000+105+10+100000+0 1766400+2649600+0+0+0+0+257000000+85+10+100000+0 1766400+2649600+0+0+0+0+257000000+65+10+100000+0 1766400+2649600+0+0+0+0+257000000+55+11+003600+0 1766400+2649600+0+0+0+0+257000000+55+11+001800+5 1766400+2649600+0+0+0+0+257000000+43+11+001800+6
disable
-[msm-therm-adc_1.CAMERA-Low]
+[ufs_therm_1.CAMERA-Low]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds 55300
+thresholds 57900
thresholds_clr 54000
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 300000+825600+1+1+1+1+257000000+43+14+000010+6
+action_info 300000+825600+1+1+1+1+257000000+36+14+000010+6
disable
-[msm-therm-adc_0.CAMERA-Mid]
+[ufs_therm_0.CAMERA-Mid]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds -100000 45900 47000 48100 49500 50500 52500 54500
-thresholds_clr -110000 44000 45900 47000 48100 49500 50500 52500
+thresholds -100000 46900 48100 49300 50500 51700 55000 57300
+thresholds_clr -110000 45700 46900 48100 49300 50500 51700 55000
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+825600+1+1+1+1+710000000+142+8+100000+0 1766400+825600+1+1+1+1+710000000+142+10+100000+0 1766400+825600+1+1+1+1+710000000+128+10+003600+0 1766400+825600+1+1+1+1+710000000+73+11+003600+0 1766400+825600+1+1+1+1+710000000+56+12+001800+0 1766400+825600+1+1+1+1+710000000+43+12+001800+0 1766400+825600+1+1+1+1+710000000+43+12+001800+5 1766400+825600+1+1+1+1+710000000+43+12+000010+6
+action_info 1766400+825600+1+1+1+1+710000000+148+9+100000+0 1766400+825600+1+1+1+1+710000000+125+9+100000+0 1766400+825600+1+1+1+1+710000000+105+9+100000+0 1766400+825600+1+1+1+1+710000000+85+10+100000+0 1766400+825600+1+1+1+1+710000000+65+10+100000+0 1766400+825600+1+1+1+1+710000000+55+11+003600+0 1766400+825600+1+1+1+1+710000000+55+11+001800+5 1766400+825600+1+1+1+1+710000000+43+11+001800+6
disable
-[msm-therm-adc_1.CAMERA-Mid]
+[ufs_therm_1.CAMERA-Mid]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds 56500
-thresholds_clr 54500
+thresholds 58900
+thresholds_clr 57300
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 300000+825600+1+1+1+1+257000000+43+14+000010+6
+action_info 300000+825600+1+1+1+1+257000000+36+14+000010+6
disable
-[msm-therm-adc.CAMERA-Hi]
+[ufs_therm_0.CAMERA-Hi]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds -100000 47000 48500 50000 50500 53000 55000 56500
-thresholds_clr -110000 46000 47000 48500 50000 50500 53000 55000
+thresholds -100000 47100 48300 49500 50700 51900 55000 57200
+thresholds_clr -110000 45900 47100 48300 49500 50700 51900 55000
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2649600+0+0+0+0+342000000+142+8+100000+0 1766400+2649600+0+0+0+0+342000000+142+10+003600+0 1766400+2649600+0+0+0+0+342000000+113+10+003600+0 1766400+2649600+0+0+0+0+342000000+73+11+001800+0 1766400+2649600+0+0+0+0+342000000+43+12+001800+0 1766400+2649600+0+0+0+0+342000000+43+12+001800+5 1766400+2649600+0+0+0+0+342000000+43+12+000010+6 300000+825600+1+1+1+1+257000000+43+14+000010+6
+action_info 1766400+2649600+0+0+0+0+342000000+148+9+100000+0 1766400+2649600+0+0+0+0+342000000+125+9+100000+0 1766400+2649600+0+0+0+0+342000000+105+10+100000+0 1766400+2649600+0+0+0+0+342000000+85+10+100000+0 1766400+2649600+0+0+0+0+342000000+65+10+100000+0 1766400+2649600+0+0+0+0+342000000+55+11+003600+0 1766400+2649600+0+0+0+0+342000000+55+11+001800+5 1766400+2649600+0+0+0+0+342000000+43+11+001800+6
disable
-[msm-therm-adc.AR-effect]
+[ufs_therm_1.CAMERA-Hi]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds -100000 47000 48500 50000 50500 53000 55000 56500
-thresholds_clr -110000 46000 47000 48500 50000 50500 53000 55000
-actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+825600+1+1+1+1+342000000+142+8+100000+0 1766400+825600+1+1+1+1+342000000+142+10+003600+0 1766400+825600+1+1+1+1+342000000+113+10+003600+0 1766400+825600+1+1+1+1+342000000+73+11+001800+0 1766400+825600+1+1+1+1+342000000+43+12+001800+0 1766400+825600+1+1+1+1+342000000+43+12+001800+5 1766400+825600+1+1+1+1+342000000+43+12+000010+6 300000+825600+1+1+1+1+257000000+43+14+000010+6
-disable
-
-[msm-therm-adc.CAMERA-HDR]
-algo_type monitor
-sensor msm-therm-adc
-sampling 1000
-thresholds -100000 47000 48500 50000 50500 53000 55000 56500
-thresholds_clr -110000 46000 47000 48500 50000 50500 53000 55000
-actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2649600+0+0+0+0+257000000+142+8+100000+0 1766400+2649600+0+0+0+0+257000000+142+10+003600+0 1766400+2649600+0+0+0+0+257000000+113+10+003600+0 1766400+2649600+0+0+0+0+257000000+73+11+001800+0 1766400+2649600+0+0+0+0+257000000+43+12+001800+0 1766400+2649600+0+0+0+0+257000000+43+12+001800+5 1766400+2649600+0+0+0+0+257000000+43+12+000010+6 300000+825600+1+1+1+1+257000000+43+14+000010+6
-disable
-
-[msm-therm-adc_0.Super-Slow]
-algo_type monitor
-sensor msm-therm-adc
-sampling 1000
-thresholds -100000 47000 47500 48500 49000 50000 52500 54500
-thresholds_clr -110000 46000 47000 47500 48500 49000 50000 52500
-actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2649600+0+0+0+0+710000000+142+8+100000+0 1766400+2649600+0+0+0+0+710000000+142+10+003600+0 1766400+2649600+0+0+0+0+710000000+128+10+003600+0 1766400+2649600+0+0+0+0+710000000+128+11+001800+0 1766400+2649600+0+0+0+0+710000000+73+11+001800+0 1766400+2649600+0+0+0+0+710000000+43+12+001800+0 1766400+2649600+0+0+0+0+710000000+43+12+001800+5 1766400+2649600+0+0+0+0+710000000+43+12+000010+6
-disable
-
-[msm-therm-adc_1.Super-Slow]
-algo_type monitor
-sensor msm-therm-adc
-sampling 1000
-thresholds 56500
-thresholds_clr 54500
+thresholds 59100
+thresholds_clr 57200
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 300000+825600+1+1+1+1+257000000+43+14+000010+6
+action_info 300000+825600+1+1+1+1+257000000+36+14+000010+6
disable
-[msm-therm-adc.Burst]
+[ufs_therm_0.AR-effect]
algo_type monitor
-sensor msm-therm-adc
+sensor ufs_therm
sampling 1000
-thresholds -100000 47000 48500 50000 51000 53500 56000 56500
-thresholds_clr -110000 46000 47000 48500 50000 51000 53500 56000
+thresholds -100000 47100 48300 49500 50700 51900 54300 56700
+thresholds_clr -110000 45900 47100 48300 49500 50700 51900 54300
actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
-action_info 1766400+2649600+0+0+0+0+710000000+142+8+100000+0 1766400+2649600+0+0+0+0+710000000+142+10+003600+0 1766400+2649600+0+0+0+0+710000000+113+10+003600+0 1766400+2649600+0+0+0+0+710000000+73+11+001800+0 1766400+2649600+0+0+0+0+710000000+43+12+001800+0 1766400+2649600+0+0+0+0+710000000+43+12+001800+5 1766400+2649600+0+0+0+0+710000000+43+12+000010+6 300000+825600+1+1+1+1+257000000+43+14+000010+6
+action_info 1766400+825600+1+1+1+1+342000000+148+8+100000+0 1766400+825600+1+1+1+1+342000000+125+8+100000+0 1766400+825600+1+1+1+1+342000000+105+9+100000+0 1766400+825600+1+1+1+1+342000000+85+9+100000+0 1766400+825600+1+1+1+1+342000000+65+10+100000+0 1766400+825600+1+1+1+1+342000000+55+11+003600+0 1766400+825600+1+1+1+1+342000000+55+11+001800+5 1766400+825600+1+1+1+1+342000000+43+11+001800+6
+disable
+
+[ufs_therm_1.AR-effect]
+algo_type monitor
+sensor ufs_therm
+sampling 1000
+thresholds 59100
+thresholds_clr 56700
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 300000+825600+1+1+1+1+257000000+36+14+000010+6
+disable
+
+[ufs_therm_0.Super-Slow]
+algo_type monitor
+sensor ufs_therm
+sampling 1000
+thresholds -100000 45800 46900 48100 49300 50500 54000 56500
+thresholds_clr -110000 44600 45800 46900 48100 49300 50500 54000
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 1766400+2649600+0+0+0+0+710000000+148+9+100000+0 1766400+2649600+0+0+0+0+710000000+125+9+100000+0 1766400+2649600+0+0+0+0+710000000+105+10+100000+0 1766400+2649600+0+0+0+0+710000000+85+10+100000+0 1766400+2649600+0+0+0+0+710000000+65+10+100000+0 1766400+2649600+0+0+0+0+710000000+55+11+003600+0 1766400+2649600+0+0+0+0+710000000+55+11+001800+5 1766400+2649600+0+0+0+0+710000000+43+11+001800+6
+disable
+
+[ufs_therm_1.Super-Slow]
+algo_type monitor
+sensor ufs_therm
+sampling 1000
+thresholds 57500
+thresholds_clr 56500
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 300000+825600+1+1+1+1+257000000+36+14+000010+6
+disable
+
+[ufs_therm_0.Burst]
+algo_type monitor
+sensor ufs_therm
+sampling 1000
+thresholds -100000 48500 49800 51000 52300 53500 56000 58500
+thresholds_clr -110000 47300 48500 49800 51000 52300 53500 56000
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 1766400+2649600+0+0+0+0+710000000+148+9+100000+0 1766400+2649600+0+0+0+0+710000000+125+9+100000+0 1766400+2649600+0+0+0+0+710000000+105+10+100000+0 1766400+2649600+0+0+0+0+710000000+85+10+100000+0 1766400+2649600+0+0+0+0+710000000+65+10+100000+0 1766400+2649600+0+0+0+0+710000000+55+11+003600+0 1766400+2649600+0+0+0+0+710000000+55+11+001800+5 1766400+2649600+0+0+0+0+710000000+43+11+001800+6
+disable
+
+[ufs_therm_1.Burst]
+algo_type monitor
+sensor ufs_therm
+sampling 1000
+thresholds 61000
+thresholds_clr 58500
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 300000+825600+1+1+1+1+257000000+36+14+000010+6
+disable
+
+[ufs_therm_0.CAMERA-HDR]
+algo_type monitor
+sensor ufs_therm
+sampling 1000
+thresholds -100000 48500 49800 51000 52300 53500 55000 57000
+thresholds_clr -110000 47300 48500 49800 51000 52300 53500 55000
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 1766400+2649600+0+0+0+0+257000000+148+9+100000+0 1766400+2649600+0+0+0+0+257000000+125+9+100000+0 1766400+2649600+0+0+0+0+257000000+105+10+100000+0 1766400+2649600+0+0+0+0+257000000+85+10+100000+0 1766400+2649600+0+0+0+0+257000000+65+10+100000+0 1766400+2649600+0+0+0+0+257000000+55+11+003600+0 1766400+2649600+0+0+0+0+257000000+55+11+001800+5 1766400+2649600+0+0+0+0+257000000+43+11+001800+6
+disable
+
+[ufs_therm_1.CAMERA-HDR]
+algo_type monitor
+sensor ufs_therm
+sampling 1000
+thresholds 61000
+thresholds_clr 57000
+actions cpu0+cpu4+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+s_charge+s_cam_ltb_tim+s_cam
+action_info 300000+825600+1+1+1+1+257000000+36+14+000010+6
disable
[sony_camera_0]
@@ -170,7 +210,16 @@ algo_type monitor
sensor sony_camera_0
sampling 1000
thresholds 68000 70000
-thresholds_clr 65000 68000
+thresholds_clr 65000 65000
+actions s_cam+s_cam_kill s_cam+s_cam_kill
+action_info 6+0 6+1
+
+[sony_camera_1]
+algo_type monitor
+sensor sony_camera_1
+sampling 1000
+thresholds 68000 70000
+thresholds_clr 65000 65000
actions s_cam+s_cam_kill s_cam+s_cam_kill
action_info 6+0 6+1
@@ -183,11 +232,29 @@ thresholds_clr 0
actions s_shutdown
action_info 5
-[msm-therm-adc]
+[wc_therm]
algo_type monitor
-sensor msm-therm-adc
+sensor wc_therm
sampling 1000
-thresholds 52500 54800 56400 63000 73000
-thresholds_clr 50800 52500 54800 56400 0
-actions s_tel+s_tether+modem+modem_proc+s_alert s_tel+s_tether+modem+modem_proc+s_alert s_tel+s_tether+modem+modem_proc+s_alert s_tel+s_tether+modem+modem_proc+s_alert s_tel+s_tether+modem+modem_proc+s_alert+s_shutdown
-action_info 0+0+1+0+1000 1+0+1+0+1000 1+1+1+1+1000 1+1+1+1+0060 1+1+1+1+0060+5
+thresholds 39600 40200 40800 41400 42100
+thresholds_clr 39100 39600 40200 40800 40800
+actions s_charge s_charge s_charge s_charge s_charge
+action_info 2 4 6 9 14
+
+[ufs_therm]
+algo_type monitor
+sensor ufs_therm
+sampling 1000
+thresholds 53300 65000 75500
+thresholds_clr 52300 63400 0
+actions modem+s_tether+s_tel+s_alert modem+s_tether+s_tel+s_alert modem+s_tether+s_tel+s_alert+s_shutdown
+action_info 1+0+1+1000 1+1+1+0060 1+1+1+0060+5
+
+[ufs_therm_2]
+algo_type monitor
+sensor ufs_therm
+sampling 1000
+thresholds 61800
+thresholds_clr 59100
+actions modem_proc
+action_info 1
diff --git a/device.mk b/device.mk
index 6065e16..1121639 100644
--- a/device.mk
+++ b/device.mk
@@ -4,14 +4,14 @@
# SPDX-License-Identifier: Apache-2.0
#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_o_mr1.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk)
# Get non-open-source specific aspects
-$(call inherit-product-if-exists, vendor/sony/xz2c/xz2c-vendor.mk)
+$(call inherit-product-if-exists, vendor/sony/akatsuki/akatsuki-vendor.mk)
# Boot animation
-TARGET_SCREEN_HEIGHT := 2160
-TARGET_SCREEN_WIDTH := 1080
+TARGET_SCREEN_HEIGHT := 2880
+TARGET_SCREEN_WIDTH := 1440
# Overlays
DEVICE_PACKAGE_OVERLAYS += \
@@ -25,9 +25,6 @@ PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := xxhdpi
-# Treble
-PRODUCT_USE_VNDK_OVERRIDE := true
-
# Inherit from tama-common
$(call inherit-product, device/sony/tama-common/common.mk)
@@ -46,8 +43,8 @@ PRODUCT_PACKAGES += \
# Input
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/idc/clearpad.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/clearpad.idc \
- $(LOCAL_PATH)/idc/synaptics_tcm_touch.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/synaptics_tcm_touch.idc
+ $(LOCAL_PATH)/idc/sidekey_dev.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/sidekey_dev.idc \
+ $(LOCAL_PATH)/idc/touch_dev.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/touch_dev.idc
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/keylayout/gpio-keys.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/gpio-keys.kl
diff --git a/extract-files.sh b/extract-files.sh
index b7a640a..f4d08e5 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -14,10 +14,10 @@ fi
set -e
# Required!
-export DEVICE=xz2c
+export DEVICE=akatsuki
export DEVICE_COMMON=tama-common
export VENDOR=sony
-export DEVICE_BRINGUP_YEAR=2020
+export DEVICE_BRINGUP_YEAR=2021
"./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"
diff --git a/idc/sidekey_dev.idc b/idc/sidekey_dev.idc
new file mode 100755
index 0000000..ac6327a
--- /dev/null
+++ b/idc/sidekey_dev.idc
@@ -0,0 +1,6 @@
+# Device Type
+touch.deviceType = touchScreen
+
+# Side touch
+touch.isSideTouch = 1
+
diff --git a/idc/synaptics_tcm_touch.idc b/idc/synaptics_tcm_touch.idc
deleted file mode 100644
index c404c9c..0000000
--- a/idc/synaptics_tcm_touch.idc
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) 2017 Synaptics Incorporated. All rights reserved.
-#
-# Copyright (C) 2017 Scott Lin
-#
-# Copyright (C) 2017, 2018 Sony Mobile Communications Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# INFORMATION CONTAINED IN THIS DOCUMENT IS PROVIDED "AS-IS," AND SYNAPTICS
-# EXPRESSLY DISCLAIMS ALL EXPRESS AND IMPLIED WARRANTIES, INCLUDING ANY
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE,
-# AND ANY WARRANTIES OF NON-INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS.
-# IN NO EVENT SHALL SYNAPTICS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, PUNITIVE, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OF THE INFORMATION CONTAINED IN THIS DOCUMENT, HOWEVER CAUSED
-# AND BASED ON ANY THEORY OF LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, AND EVEN IF SYNAPTICS WAS ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE. IF A TRIBUNAL OF COMPETENT JURISDICTION DOES
-# NOT PERMIT THE DISCLAIMER OF DIRECT DAMAGES OR ANY OTHER DAMAGES, SYNAPTICS'
-# TOTAL CUMULATIVE LIABILITY TO ANY PARTY SHALL NOT EXCEED ONE HUNDRED U.S.
-# DOLLARS.
-
-device.internal = 1
-
-touch.deviceType = touchScreen
-touch.orientationAware = 1
-
-touch.size.calibration = geometric
-touch.size.scale = 1
-touch.size.bias = 0
-touch.size.isSummed = 0
-
-touch.pressure.scale = 0.008
diff --git a/idc/clearpad.idc b/idc/touch_dev.idc
old mode 100644
new mode 100755
similarity index 66%
rename from idc/clearpad.idc
rename to idc/touch_dev.idc
index ddfd4d7..af96c85
--- a/idc/clearpad.idc
+++ b/idc/touch_dev.idc
@@ -2,4 +2,4 @@
touch.deviceType = touchScreen
# Pressure
-touch.pressure.scale = 0.009
+touch.pressure.scale = 0.015
diff --git a/keylayout/gpio-keys.kl b/keylayout/gpio-keys.kl
old mode 100644
new mode 100755
diff --git a/lineage_akatsuki.mk b/lineage_akatsuki.mk
new file mode 100644
index 0000000..fd8c7c3
--- /dev/null
+++ b/lineage_akatsuki.mk
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2018-2020 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Inherit from akatsuki device
+$(call inherit-product, device/sony/akatsuki/device.mk)
+
+# Inherit some common Lineage stuff.
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+
+PRODUCT_NAME := lineage_akatsuki
+PRODUCT_DEVICE := akatsuki
+PRODUCT_MANUFACTURER := Sony
+PRODUCT_BRAND := Sony
+PRODUCT_MODEL := Xperia XZ3
+
+PRODUCT_GMS_CLIENTID_BASE := android-sony-mobile
+
+PRODUCT_BUILD_PROP_OVERRIDES += \
+ PRODUCT_DEVICE="H9436" \
+ PRODUCT_NAME="H9436" \
+ PRIVATE_BUILD_DESC="H9436-user 10 52.1.A.3.92 052001A003009202694550183 release-keys"
+
+BUILD_FINGERPRINT := Sony/H9493/H9493:10/52.1.A.3.92/052001A003009202694550183:user/release-keys
diff --git a/lineage_xz2c.mk b/lineage_xz2c.mk
deleted file mode 100644
index 5fbebbe..0000000
--- a/lineage_xz2c.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2018-2020 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# Inherit from xz2c device
-$(call inherit-product, device/sony/xz2c/device.mk)
-
-# Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
-
-PRODUCT_NAME := lineage_xz2c
-PRODUCT_DEVICE := xz2c
-PRODUCT_MANUFACTURER := Sony
-PRODUCT_BRAND := Sony
-PRODUCT_MODEL := Xperia XZ2 Compact
-
-PRODUCT_GMS_CLIENTID_BASE := android-sony
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
- PRODUCT_DEVICE="H8324" \
- PRODUCT_NAME="H8324" \
- PRIVATE_BUILD_DESC="H8324-user 10 52.1.A.3.49 052001A003004902006556692 release-keys"
-
-BUILD_FINGERPRINT := Sony/H8324/H8324:10/52.1.A.3.49/052001A003004902006556692:user/release-keys
diff --git a/manifest.xml b/manifest.xml
index 7c9162f..c49af60 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -12,11 +12,12 @@
android.hardware.keymaster
hwbinder
- 3.0
+ 4.0
IKeymasterDevice
default
+ @4.0::IKeymasterDevice/default
vendor.lineage.livedisplay
diff --git a/nfc/libnfc-nxp.conf b/nfc/libnfc-nxp.conf
old mode 100644
new mode 100755
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 0c9bf4a..fb31fc1 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -25,9 +25,6 @@
Software implementation will be used if config_hardware_auto_brightness_available is not set -->
true
-
- true
-
- 1
+ 2
- 1
+ 3
+ - 32
- 64
- 128
- 170
@@ -87,14 +85,15 @@
- 1
+ 2
- - 10
+ - 3
+ - 10
- 32
- 64
- 80
@@ -109,7 +108,38 @@
- 255
+
+ true
+
+
+ 70
+
+
+ -18
+
+
+ 18
+
+
+ -45
+
+
+ 45
+
+
+ true
+
+
+ false
+
+
+ true
+
http://uaprof.sonymobile.com/H8324R5201.xml
+ >http://uaprof.sonymobile.com/H9436R5201.xml
diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
old mode 100644
new mode 100755
index a936810..ede9f48
--- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -1,18 +1,18 @@
- - 44.37
- - 44.37
- - 281.40
+ - 28.83
+ - 94.23
+ - 296.49
- 0
- 0
- - 1.46
+ - 1.01
- 92.06
- 256.24
- - 38.56
- - 140.89
+ - 33.56
+ - 92.85
- 47.75
- - 579.00
- - 97.37
+ - 310.54
+ - 101.25
- 10.94
4.70
@@ -132,7 +132,7 @@
128.0
143.9
- - 2760
+ - 3200
- 0.00
- 5.55
- 6.70
diff --git a/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..7b8ba0d
--- /dev/null
+++ b/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ true
+ false
+
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 132a71e..361f07d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# Sony package version: 52.1.A.3.49
+# Sony package version: 52.1.A.3.92
# ACDB
vendor/etc/acdbdata/MTP/MTP_Bluetooth_cal.acdb
@@ -42,211 +42,206 @@ vendor/lib/libbtnv.so
# Camera
vendor/bin/hw/vendor.somc.hardware.camera.provider@1.0-service
-vendor/camera/CHI05BN1/color_ctrl.dat
-vendor/camera/CHI05BN1/dataflow.dat
-vendor/camera/CHI05BN1/exposure_ctrl.dat
-vendor/camera/CHI05BN1/exposure_ctrl_diagram.dat
-vendor/camera/CHI05BN1/face_detector.dat
-vendor/camera/CHI05BN1/flicker_detector.dat
-vendor/camera/CHI05BN1/food_comp_yummy.dat
-vendor/camera/CHI05BN1/food_detector.dat
-vendor/camera/CHI05BN1/fusion_comp.dat
-vendor/camera/CHI05BN1/fusion_comp_financier_coef.dat
-vendor/camera/CHI05BN1/fusion_comp_financier.dat
-vendor/camera/CHI05BN1/fusion_comp_melonpan.dat
-vendor/camera/CHI05BN1/fusion_comp_raisin.dat
-vendor/camera/CHI05BN1/hal_ctrl_bps_gamma16.dat
-vendor/camera/CHI05BN1/hal_ctrl.dat
-vendor/camera/CHI05BN1/hal_ctrl_fusion_ctrl.dat
-vendor/camera/CHI05BN1/hal_ctrl_ife_abf34.dat
-vendor/camera/CHI05BN1/hal_ctrl_ife_abf34_disable.dat
-vendor/camera/CHI05BN1/hal_ctrl_ife_bls12.dat
-vendor/camera/CHI05BN1/hal_ctrl_ife_bpcbcc50.dat
-vendor/camera/CHI05BN1/hal_ctrl_ife_cst12.dat
-vendor/camera/CHI05BN1/hal_ctrl_ife_demosaic36.dat
-vendor/camera/CHI05BN1/hal_ctrl_ife_gamma16.dat
-vendor/camera/CHI05BN1/hal_ctrl_ife_linearization33.dat
-vendor/camera/CHI05BN1/hal_ctrl_ife_lsc34.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_anr10_dc04.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_anr10_dc16.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_anr10_dc64.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_anr10_disable.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_anr10_full.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_asf30.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_cc13.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_cs20.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_cst12.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_cv12.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_gamma15.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_gra10.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_ltm13.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_tdl10.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_tf10_dc04.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_tf10_dc16.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_tf10_dc64.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_tf10_disable.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_tf10_full.dat
-vendor/camera/CHI05BN1/hal_ctrl_ipe_upscale20.dat
-vendor/camera/CHI05BN1/hal_ctrl_platform_nree.dat
-vendor/camera/CHI05BN1/hal_ctrl_sensor_isp_color.dat
-vendor/camera/CHI05BN1/hal_ctrl_sensor_isp_fsn.dat
-vendor/camera/CHI05BN1/hal_ctrl_sensor_isp_lin_ne.dat
-vendor/camera/CHI05BN1/hdr_comp.dat
-vendor/camera/CHI05BN1/idt_ctrl.dat
-vendor/camera/CHI05BN1/image_conv_canele.dat
-vendor/camera/CHI05BN1/image_conv_cheesescone.dat
-vendor/camera/CHI05BN1/image_conv.dat
-vendor/camera/CHI05BN1/image_conv_ipe_asf30.dat
-vendor/camera/CHI05BN1/image_conv_ipe_cs20.dat
-vendor/camera/CHI05BN1/image_conv_ipe_gra10.dat
-vendor/camera/CHI05BN1/image_conv_ipe_upscale20.dat
-vendor/camera/CHI05BN1/image_conv_marble.dat
-vendor/camera/CHI05BN1/image_conv_platform_nree.dat
-vendor/camera/CHI05BN1/image_conv_raisin.dat
-vendor/camera/CHI05BN1/image_conv_spica.dat
-vendor/camera/CHI05BN1/lens_ctrl_common.dat
-vendor/camera/CHI05BN1/lens_ctrl.dat
-vendor/camera/CHI05BN1/motion_detector.dat
-vendor/camera/CHI05BN1/motion_detector_sumomo.dat
-vendor/camera/CHI05BN1/motion_estimation.dat
-vendor/camera/CHI05BN1/multiframe_nr.dat
-vendor/camera/CHI05BN1/multiframe_nr_melonpan.dat
-vendor/camera/CHI05BN1/multiframe_nr_mugichoco.dat
-vendor/camera/CHI05BN1/multiframe_nr_toppo.dat
-vendor/camera/CHI05BN1/object_detector.dat
-vendor/camera/CHI05BN1/object_tracker.dat
-vendor/camera/CHI05BN1/prc_image_conv.dat
-vendor/camera/CHI05BN1/process_ctrl.dat
-vendor/camera/CHI05BN1/raw_proc_bps_abf40.dat
-vendor/camera/CHI05BN1/raw_proc_bps_abf40_disable.dat
-vendor/camera/CHI05BN1/raw_proc_bps_bls12.dat
-vendor/camera/CHI05BN1/raw_proc_bps_demosaic36.dat
-vendor/camera/CHI05BN1/raw_proc_bps_gic30.dat
-vendor/camera/CHI05BN1/raw_proc_bps_hnr10.dat
-vendor/camera/CHI05BN1/raw_proc_bps_hnr10_disable.dat
-vendor/camera/CHI05BN1/raw_proc_bps_linearization34.dat
-vendor/camera/CHI05BN1/raw_proc_bps_pdpc20.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_anr10_dc04.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_anr10_dc16.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_anr10_dc64.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_anr10_disable.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_anr10_full.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_asf30.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_cs20.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_gra10.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_tf10_dc04.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_tf10_dc16.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_tf10_dc64.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_tf10_disable.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_tf10_full.dat
-vendor/camera/CHI05BN1/raw_proc_ipe_upscale20.dat
-vendor/camera/CHI05BN1/raw_proc_platform_nree.dat
-vendor/camera/CHI05BN1/scene_detector.dat
-vendor/camera/default.dat
-vendor/camera/flash.dat
-vendor/camera/LGI05BN1/color_ctrl.dat
-vendor/camera/LGI05BN1/dataflow.dat
-vendor/camera/LGI05BN1/exposure_ctrl.dat
-vendor/camera/LGI05BN1/exposure_ctrl_diagram.dat
-vendor/camera/LGI05BN1/face_detector.dat
-vendor/camera/LGI05BN1/flicker_detector.dat
-vendor/camera/LGI05BN1/food_comp_yummy.dat
-vendor/camera/LGI05BN1/food_detector.dat
-vendor/camera/LGI05BN1/fusion_comp.dat
-vendor/camera/LGI05BN1/fusion_comp_financier_coef.dat
-vendor/camera/LGI05BN1/fusion_comp_financier.dat
-vendor/camera/LGI05BN1/fusion_comp_melonpan.dat
-vendor/camera/LGI05BN1/fusion_comp_raisin.dat
-vendor/camera/LGI05BN1/hal_ctrl_bps_gamma16.dat
-vendor/camera/LGI05BN1/hal_ctrl.dat
-vendor/camera/LGI05BN1/hal_ctrl_fusion_ctrl.dat
-vendor/camera/LGI05BN1/hal_ctrl_ife_abf34.dat
-vendor/camera/LGI05BN1/hal_ctrl_ife_abf34_disable.dat
-vendor/camera/LGI05BN1/hal_ctrl_ife_bls12.dat
-vendor/camera/LGI05BN1/hal_ctrl_ife_bpcbcc50.dat
-vendor/camera/LGI05BN1/hal_ctrl_ife_cst12.dat
-vendor/camera/LGI05BN1/hal_ctrl_ife_demosaic36.dat
-vendor/camera/LGI05BN1/hal_ctrl_ife_gamma16.dat
-vendor/camera/LGI05BN1/hal_ctrl_ife_linearization33.dat
-vendor/camera/LGI05BN1/hal_ctrl_ife_lsc34.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_anr10_dc04.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_anr10_dc16.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_anr10_dc64.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_anr10_disable.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_anr10_full.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_asf30.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_cc13.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_cs20.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_cst12.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_cv12.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_gamma15.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_gra10.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_ltm13.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_tdl10.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_tf10_dc04.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_tf10_dc16.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_tf10_dc64.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_tf10_disable.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_tf10_full.dat
-vendor/camera/LGI05BN1/hal_ctrl_ipe_upscale20.dat
-vendor/camera/LGI05BN1/hal_ctrl_platform_nree.dat
-vendor/camera/LGI05BN1/hal_ctrl_sensor_isp_color.dat
-vendor/camera/LGI05BN1/hal_ctrl_sensor_isp_fsn.dat
-vendor/camera/LGI05BN1/hal_ctrl_sensor_isp_lin_ne.dat
-vendor/camera/LGI05BN1/hdr_comp.dat
-vendor/camera/LGI05BN1/idt_ctrl.dat
-vendor/camera/LGI05BN1/image_conv_canele.dat
-vendor/camera/LGI05BN1/image_conv_cheesescone.dat
-vendor/camera/LGI05BN1/image_conv.dat
-vendor/camera/LGI05BN1/image_conv_ipe_asf30.dat
-vendor/camera/LGI05BN1/image_conv_ipe_cs20.dat
-vendor/camera/LGI05BN1/image_conv_ipe_gra10.dat
-vendor/camera/LGI05BN1/image_conv_ipe_upscale20.dat
-vendor/camera/LGI05BN1/image_conv_marble.dat
-vendor/camera/LGI05BN1/image_conv_platform_nree.dat
-vendor/camera/LGI05BN1/image_conv_raisin.dat
-vendor/camera/LGI05BN1/image_conv_spica.dat
-vendor/camera/LGI05BN1/lens_ctrl_common.dat
-vendor/camera/LGI05BN1/lens_ctrl.dat
-vendor/camera/LGI05BN1/motion_detector.dat
-vendor/camera/LGI05BN1/motion_detector_sumomo.dat
-vendor/camera/LGI05BN1/motion_estimation.dat
-vendor/camera/LGI05BN1/multiframe_nr.dat
-vendor/camera/LGI05BN1/multiframe_nr_melonpan.dat
-vendor/camera/LGI05BN1/multiframe_nr_mugichoco.dat
-vendor/camera/LGI05BN1/multiframe_nr_toppo.dat
-vendor/camera/LGI05BN1/object_detector.dat
-vendor/camera/LGI05BN1/object_tracker.dat
-vendor/camera/LGI05BN1/prc_image_conv.dat
-vendor/camera/LGI05BN1/process_ctrl.dat
-vendor/camera/LGI05BN1/raw_proc_bps_abf40.dat
-vendor/camera/LGI05BN1/raw_proc_bps_abf40_disable.dat
-vendor/camera/LGI05BN1/raw_proc_bps_bls12.dat
-vendor/camera/LGI05BN1/raw_proc_bps_demosaic36.dat
-vendor/camera/LGI05BN1/raw_proc_bps_gic30.dat
-vendor/camera/LGI05BN1/raw_proc_bps_hnr10.dat
-vendor/camera/LGI05BN1/raw_proc_bps_hnr10_disable.dat
-vendor/camera/LGI05BN1/raw_proc_bps_linearization34.dat
-vendor/camera/LGI05BN1/raw_proc_bps_pdpc20.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_anr10_dc04.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_anr10_dc16.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_anr10_dc64.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_anr10_disable.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_anr10_full.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_asf30.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_cs20.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_gra10.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_tf10_dc04.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_tf10_dc16.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_tf10_dc64.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_tf10_disable.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_tf10_full.dat
-vendor/camera/LGI05BN1/raw_proc_ipe_upscale20.dat
-vendor/camera/LGI05BN1/raw_proc_platform_nree.dat
-vendor/camera/LGI05BN1/scene_detector.dat
-vendor/camera/snapshot.dat
-vendor/camera/SOI20BS2_BU64747GWZ_XCF.dat
-vendor/camera/SOI20BS2_BU64747GWZ_XFW.dat
+vendor/camera/LGI13BS0/color_ctrl.dat
+vendor/camera/LGI13BS0/dataflow.dat
+vendor/camera/LGI13BS0/exposure_ctrl.dat
+vendor/camera/LGI13BS0/exposure_ctrl_diagram.dat
+vendor/camera/LGI13BS0/face_detector.dat
+vendor/camera/LGI13BS0/flicker_detector.dat
+vendor/camera/LGI13BS0/food_comp_yummy.dat
+vendor/camera/LGI13BS0/food_detector.dat
+vendor/camera/LGI13BS0/fusion_comp.dat
+vendor/camera/LGI13BS0/fusion_comp_financier_coef.dat
+vendor/camera/LGI13BS0/fusion_comp_financier.dat
+vendor/camera/LGI13BS0/fusion_comp_melonpan.dat
+vendor/camera/LGI13BS0/fusion_comp_raisin.dat
+vendor/camera/LGI13BS0/hal_ctrl_bps_gamma16.dat
+vendor/camera/LGI13BS0/hal_ctrl.dat
+vendor/camera/LGI13BS0/hal_ctrl_fusion_ctrl.dat
+vendor/camera/LGI13BS0/hal_ctrl_ife_abf34.dat
+vendor/camera/LGI13BS0/hal_ctrl_ife_abf34_disable.dat
+vendor/camera/LGI13BS0/hal_ctrl_ife_bls12.dat
+vendor/camera/LGI13BS0/hal_ctrl_ife_bpcbcc50.dat
+vendor/camera/LGI13BS0/hal_ctrl_ife_cst12.dat
+vendor/camera/LGI13BS0/hal_ctrl_ife_demosaic36.dat
+vendor/camera/LGI13BS0/hal_ctrl_ife_gamma16.dat
+vendor/camera/LGI13BS0/hal_ctrl_ife_linearization33.dat
+vendor/camera/LGI13BS0/hal_ctrl_ife_lsc34.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_anr10_dc04.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_anr10_dc16.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_anr10_dc64.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_anr10_disable.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_anr10_full.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_asf30.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_cc13.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_cs20.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_cst12.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_cv12.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_gamma15.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_gra10.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_ltm13.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_tdl10.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_tf10_dc04.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_tf10_dc16.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_tf10_dc64.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_tf10_disable.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_tf10_full.dat
+vendor/camera/LGI13BS0/hal_ctrl_ipe_upscale20.dat
+vendor/camera/LGI13BS0/hal_ctrl_platform_nree.dat
+vendor/camera/LGI13BS0/hal_ctrl_sensor_isp_color.dat
+vendor/camera/LGI13BS0/hal_ctrl_sensor_isp_fsn.dat
+vendor/camera/LGI13BS0/hal_ctrl_sensor_isp_lin_ne.dat
+vendor/camera/LGI13BS0/hdr_comp.dat
+vendor/camera/LGI13BS0/idt_ctrl.dat
+vendor/camera/LGI13BS0/image_conv_canele.dat
+vendor/camera/LGI13BS0/image_conv_cheesescone.dat
+vendor/camera/LGI13BS0/image_conv.dat
+vendor/camera/LGI13BS0/image_conv_ipe_asf30.dat
+vendor/camera/LGI13BS0/image_conv_ipe_cs20.dat
+vendor/camera/LGI13BS0/image_conv_ipe_gra10.dat
+vendor/camera/LGI13BS0/image_conv_ipe_upscale20.dat
+vendor/camera/LGI13BS0/image_conv_marble.dat
+vendor/camera/LGI13BS0/image_conv_platform_nree.dat
+vendor/camera/LGI13BS0/image_conv_raisin.dat
+vendor/camera/LGI13BS0/image_conv_spica.dat
+vendor/camera/LGI13BS0/lens_ctrl_common.dat
+vendor/camera/LGI13BS0/lens_ctrl.dat
+vendor/camera/LGI13BS0/motion_detector.dat
+vendor/camera/LGI13BS0/motion_detector_sumomo.dat
+vendor/camera/LGI13BS0/motion_estimation.dat
+vendor/camera/LGI13BS0/multiframe_nr.dat
+vendor/camera/LGI13BS0/multiframe_nr_melonpan.dat
+vendor/camera/LGI13BS0/multiframe_nr_mugichoco.dat
+vendor/camera/LGI13BS0/multiframe_nr_toppo.dat
+vendor/camera/LGI13BS0/object_detector.dat
+vendor/camera/LGI13BS0/object_tracker.dat
+vendor/camera/LGI13BS0/prc_image_conv.dat
+vendor/camera/LGI13BS0/process_ctrl.dat
+vendor/camera/LGI13BS0/raw_proc_bps_abf40.dat
+vendor/camera/LGI13BS0/raw_proc_bps_abf40_disable.dat
+vendor/camera/LGI13BS0/raw_proc_bps_bls12.dat
+vendor/camera/LGI13BS0/raw_proc_bps_demosaic36.dat
+vendor/camera/LGI13BS0/raw_proc_bps_gic30.dat
+vendor/camera/LGI13BS0/raw_proc_bps_hnr10.dat
+vendor/camera/LGI13BS0/raw_proc_bps_hnr10_disable.dat
+vendor/camera/LGI13BS0/raw_proc_bps_linearization34.dat
+vendor/camera/LGI13BS0/raw_proc_bps_pdpc20.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_anr10_dc04.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_anr10_dc16.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_anr10_dc64.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_anr10_disable.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_anr10_full.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_asf30.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_cs20.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_gra10.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_tf10_dc04.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_tf10_dc16.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_tf10_dc64.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_tf10_disable.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_tf10_full.dat
+vendor/camera/LGI13BS0/raw_proc_ipe_upscale20.dat
+vendor/camera/LGI13BS0/raw_proc_platform_nree.dat
+vendor/camera/LGI13BS0/scene_detector.dat
+vendor/camera/MTM13BS0/color_ctrl.dat
+vendor/camera/MTM13BS0/dataflow.dat
+vendor/camera/MTM13BS0/exposure_ctrl.dat
+vendor/camera/MTM13BS0/exposure_ctrl_diagram.dat
+vendor/camera/MTM13BS0/face_detector.dat
+vendor/camera/MTM13BS0/flicker_detector.dat
+vendor/camera/MTM13BS0/food_comp_yummy.dat
+vendor/camera/MTM13BS0/food_detector.dat
+vendor/camera/MTM13BS0/fusion_comp.dat
+vendor/camera/MTM13BS0/fusion_comp_financier_coef.dat
+vendor/camera/MTM13BS0/fusion_comp_financier.dat
+vendor/camera/MTM13BS0/fusion_comp_melonpan.dat
+vendor/camera/MTM13BS0/fusion_comp_raisin.dat
+vendor/camera/MTM13BS0/hal_ctrl_bps_gamma16.dat
+vendor/camera/MTM13BS0/hal_ctrl.dat
+vendor/camera/MTM13BS0/hal_ctrl_fusion_ctrl.dat
+vendor/camera/MTM13BS0/hal_ctrl_ife_abf34.dat
+vendor/camera/MTM13BS0/hal_ctrl_ife_abf34_disable.dat
+vendor/camera/MTM13BS0/hal_ctrl_ife_bls12.dat
+vendor/camera/MTM13BS0/hal_ctrl_ife_bpcbcc50.dat
+vendor/camera/MTM13BS0/hal_ctrl_ife_cst12.dat
+vendor/camera/MTM13BS0/hal_ctrl_ife_demosaic36.dat
+vendor/camera/MTM13BS0/hal_ctrl_ife_gamma16.dat
+vendor/camera/MTM13BS0/hal_ctrl_ife_linearization33.dat
+vendor/camera/MTM13BS0/hal_ctrl_ife_lsc34.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_anr10_dc04.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_anr10_dc16.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_anr10_dc64.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_anr10_disable.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_anr10_full.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_asf30.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_cc13.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_cs20.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_cst12.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_cv12.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_gamma15.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_gra10.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_ltm13.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_tdl10.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_tf10_dc04.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_tf10_dc16.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_tf10_dc64.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_tf10_disable.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_tf10_full.dat
+vendor/camera/MTM13BS0/hal_ctrl_ipe_upscale20.dat
+vendor/camera/MTM13BS0/hal_ctrl_platform_nree.dat
+vendor/camera/MTM13BS0/hal_ctrl_sensor_isp_color.dat
+vendor/camera/MTM13BS0/hal_ctrl_sensor_isp_fsn.dat
+vendor/camera/MTM13BS0/hal_ctrl_sensor_isp_lin_ne.dat
+vendor/camera/MTM13BS0/hdr_comp.dat
+vendor/camera/MTM13BS0/idt_ctrl.dat
+vendor/camera/MTM13BS0/image_conv_canele.dat
+vendor/camera/MTM13BS0/image_conv_cheesescone.dat
+vendor/camera/MTM13BS0/image_conv.dat
+vendor/camera/MTM13BS0/image_conv_ipe_asf30.dat
+vendor/camera/MTM13BS0/image_conv_ipe_cs20.dat
+vendor/camera/MTM13BS0/image_conv_ipe_gra10.dat
+vendor/camera/MTM13BS0/image_conv_ipe_upscale20.dat
+vendor/camera/MTM13BS0/image_conv_marble.dat
+vendor/camera/MTM13BS0/image_conv_platform_nree.dat
+vendor/camera/MTM13BS0/image_conv_raisin.dat
+vendor/camera/MTM13BS0/image_conv_spica.dat
+vendor/camera/MTM13BS0/lens_ctrl_common.dat
+vendor/camera/MTM13BS0/lens_ctrl.dat
+vendor/camera/MTM13BS0/motion_detector.dat
+vendor/camera/MTM13BS0/motion_detector_sumomo.dat
+vendor/camera/MTM13BS0/motion_estimation.dat
+vendor/camera/MTM13BS0/multiframe_nr.dat
+vendor/camera/MTM13BS0/multiframe_nr_melonpan.dat
+vendor/camera/MTM13BS0/multiframe_nr_mugichoco.dat
+vendor/camera/MTM13BS0/multiframe_nr_toppo.dat
+vendor/camera/MTM13BS0/object_detector.dat
+vendor/camera/MTM13BS0/object_tracker.dat
+vendor/camera/MTM13BS0/prc_image_conv.dat
+vendor/camera/MTM13BS0/process_ctrl.dat
+vendor/camera/MTM13BS0/raw_proc_bps_abf40.dat
+vendor/camera/MTM13BS0/raw_proc_bps_abf40_disable.dat
+vendor/camera/MTM13BS0/raw_proc_bps_bls12.dat
+vendor/camera/MTM13BS0/raw_proc_bps_demosaic36.dat
+vendor/camera/MTM13BS0/raw_proc_bps_gic30.dat
+vendor/camera/MTM13BS0/raw_proc_bps_hnr10.dat
+vendor/camera/MTM13BS0/raw_proc_bps_hnr10_disable.dat
+vendor/camera/MTM13BS0/raw_proc_bps_linearization34.dat
+vendor/camera/MTM13BS0/raw_proc_bps_pdpc20.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_anr10_dc04.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_anr10_dc16.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_anr10_dc64.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_anr10_disable.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_anr10_full.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_asf30.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_cs20.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_gra10.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_tf10_dc04.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_tf10_dc16.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_tf10_dc64.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_tf10_disable.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_tf10_full.dat
+vendor/camera/MTM13BS0/raw_proc_ipe_upscale20.dat
+vendor/camera/MTM13BS0/raw_proc_platform_nree.dat
+vendor/camera/MTM13BS0/scene_detector.dat
vendor/camera/SOI20BS2/color_ctrl.dat
vendor/camera/SOI20BS2/dataflow.dat
vendor/camera/SOI20BS2/exposure_ctrl.dat
@@ -347,6 +342,11 @@ vendor/camera/SOI20BS2/raw_proc_ipe_tf10_full.dat
vendor/camera/SOI20BS2/raw_proc_ipe_upscale20.dat
vendor/camera/SOI20BS2/raw_proc_platform_nree.dat
vendor/camera/SOI20BS2/scene_detector.dat
+vendor/camera/default.dat
+vendor/camera/flash.dat
+vendor/camera/snapshot.dat
+vendor/camera/SOI20BS2_BU64747GWZ_XCF.dat
+vendor/camera/SOI20BS2_BU64747GWZ_XFW.dat
vendor/camera/streaming.dat
vendor/camera/supported.dat
vendor/camera/version.dat
@@ -396,7 +396,7 @@ vendor/lib/camera/components/com.qti.stats.pdlibsony.so
vendor/lib/camera/components/com.qti.stats.pdlibwrapper.so
vendor/lib/camera/com.qti.tuned.default.bin
vendor/lib/camera/com.sony.sensormodule.blakiston_imx400.bin
-vendor/lib/camera/com.sony.sensormodule.pansy_imx241.bin
+vendor/lib/camera/com.sony.sensormodule.poodle_imx258.bin
vendor/lib/camera/fdconfigpreview.bin
vendor/lib/camera/fdconfigpreviewlite.bin
vendor/lib/camera/fdconfigvideo.bin
@@ -545,16 +545,7 @@ vendor/lib/libscvePanorama.so
vendor/lib/libscveScan3D.so
# Display calibration
-vendor/etc/qdcm_calib_data_4.xml
-vendor/etc/qdcm_calib_data_8.xml
-vendor/etc/qdcm_calib_data_Dual_nt35597_cmd_mode_dsi_truly_panel_without_DSC.xml
-vendor/etc/qdcm_calib_data_Dual_nt35597_video_mode_dsi_truly_panel_without_DSC.xml
-vendor/etc/qdcm_calib_data_Dual_nt36850_cmd_mode_dsi_truly_panel_without_DSC.xml
-vendor/etc/qdcm_calib_data_hx8399_video_mode_dsi_truly_panel.xml
-vendor/etc/qdcm_calib_data_nt35597_cmd_mode_dsi_truly_panel_with_DSC.xml
-vendor/etc/qdcm_calib_data_nt35597_video_mode_dsi_truly_panel_with_DSC.xml
-vendor/etc/qdcm_calib_data_Sharp_4k_cmd_mode_dsc_dsi_panel.xml
-vendor/etc/qdcm_calib_data_Sharp_4k_video_mode_dsc_dsi_panel.xml
+vendor/etc/qdcm_calib_data_5.xml
# Display colour
vendor/bin/hw/vendor.display.color@1.0-service
@@ -661,23 +652,17 @@ vendor/lib/vendor.qti.gnss@2.1.so
vendor/lib/vendor.qti.gnss@3.0.so
vendor/lib/vendor.qti.gnss@3.0-service.so
-# Hotword enrollment
--system/priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk;PRESIGNED
--system/priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk;PRESIGNED
-
# Keymaster
-vendor/bin/hw/android.hardware.keymaster@3.0-service-qti
-vendor/etc/init/android.hardware.keymaster@3.0-service-qti.rc
-vendor/lib64/android.hardware.keymaster@3.0-impl-qti.so
-vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so
+vendor/bin/hw/android.hardware.keymaster@4.0-service-qti
+vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc
vendor/lib64/libkeymasterdeviceutils.so
vendor/lib64/libkeymasterprovision.so
vendor/lib64/libkeymasterutils.so
-vendor/lib/android.hardware.keymaster@3.0-impl-qti.so
-vendor/lib/hw/android.hardware.keymaster@3.0-impl-qti.so
+vendor/lib64/libqtikeymaster4.so
vendor/lib/libkeymasterdeviceutils.so
vendor/lib/libkeymasterprovision.so
vendor/lib/libkeymasterutils.so
+vendor/lib/libqtikeymaster4.so
# Sensors
vendor/lib64/sensors.ssc.so
@@ -685,6 +670,9 @@ vendor/lib/sensors.ssc.so
# Sensor configs
vendor/etc/sensors/hals.conf
+vendor/etc/sensors/sns_reg_config
+vendor/etc/sensors/registry/sns_reg_config
+vendor/etc/sensors/registry/sns_reg_version
vendor/etc/sensors/registry/config/bmp380_0.json
vendor/etc/sensors/registry/config/lsm6dsm_0_8g.json
vendor/etc/sensors/registry/config/sdm845_ak991x_0.json
@@ -727,19 +715,15 @@ vendor/etc/sensors/registry/config/sns_tilt_to_wake.json
vendor/etc/sensors/registry/config/sns_wrist_pedo.json
vendor/etc/sensors/registry/config/tmd2725.json
vendor/etc/sensors/registry/registry/sensors_registry
-vendor/etc/sensors/registry/sns_reg_config
-vendor/etc/sensors/registry/sns_reg_version
vendor/etc/sensors/registry/somc/sdm845_lsm6dsm_0_accel_miscta.json
vendor/etc/sensors/registry/somc/sdm845_lsm6dsm_0_gyro_miscta.json
vendor/etc/sensors/registry/somc/tmd2725_prox_miscta.json
-vendor/etc/sensors/sns_reg_config
# Thermal configs
vendor/etc/change.cfg
# Touch firmware
-vendor/firmware/touch_module_id_0x30.img
-vendor/firmware/touch_module_id_0x31.img
+vendor/firmware/touch_module_id_0x01.img
# WiFi
vendor/etc/wifi/bdwlan.bin
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index bfd84a7..ae173b5 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -8,10 +8,10 @@
set -e
# Required!
-export DEVICE=xz2c
+export DEVICE=akatsuki
export DEVICE_COMMON=tama-common
export VENDOR=sony
-export DEVICE_BRINGUP_YEAR=2020
+export DEVICE_BRINGUP_YEAR=2021
"./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"
diff --git a/system.prop b/system.prop
index 15795ff..69650c1 100644
--- a/system.prop
+++ b/system.prop
@@ -2,13 +2,13 @@
camera.disable_zsl_mode=1
# SEMC
-ro.semc.ms_type_id=PM-1130-BV
-ro.semc.product.device=H83
-ro.semc.product.model=H8324
-ro.semc.product.name=Xperia XZ2 Compact
+ro.semc.ms_type_id=PM-1155-BV
+ro.semc.product.device=H94
+ro.semc.product.model=H9493
+ro.semc.product.name=Xperia XZ3
ro.semc.version.fs=GENERIC
-ro.semc.version.fs_revision=52.1.A.3.49
-ro.semc.version.sw=1311-5320
-ro.semc.version.sw_revision=52.1.A.3.49
+ro.semc.version.fs_revision=52.1.A.3.92
+ro.semc.version.sw=1313-7483
+ro.semc.version.sw_revision=52.1.A.3.92
ro.semc.version.sw_type=user
-ro.semc.version.sw_variant=GLOBAL-A2
+ro.semc.version.sw_variant=CHINA-C2
diff --git a/vendor.prop b/vendor.prop
index d36c595..7fedbc2 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -2,8 +2,5 @@
vendor.display.enable_default_color_mode=1
vendor.display.disable_hdr_lut_gen=1
-# NFC
-ro.vendor.nfc.ko=nxp_pn553_nfc
-
# Netflix
-ro.netflix.bsp_rev=Q845-05000-1
+ro.netflix.bsp_rev=Q845-14477-1