Merge "Initial Bootloader prebuilt for AP3% build" into main
diff --git a/device-felix.mk b/device-felix.mk
index 447d3e8..1166a1f 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -220,7 +220,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=42
+ ro.vendor.build.svn=43
# Vibrator HAL
PRODUCT_VENDOR_PROPERTIES +=\
diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 16d2bb7..9d91e32 100644
--- a/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -78,8 +78,17 @@
m 589.2,66.53 a 49.5,49.5 0 0 1 -49.5,49.5 49.5,49.5 0 0 1 -49.5,-49.5 49.5,49.5 0 0 1 49.5,-49.5 49.5,49.5 0 0 1 49.5,49.5 z
</string>
- <!-- Camera 0 is the front camera -->
+ <!-- 1 is the logical id of the front camera -->
<string translatable="false" name="config_protectedCameraId">1</string>
+ <!-- 5 is the physical id of the outer screen front camera -->
+ <string translatable="false" name="config_protectedPhysicalCameraId">5</string>
+
+ <!-- The properties of the face auth front camera in pixels -->
+ <integer-array name="config_face_auth_props">
+ <item>540</item> <!-- sensorLocationX -->
+ <item>66</item> <!-- sensorLocationY -->
+ <item>50</item> <!--sensorRadius -->
+ </integer-array>
<!-- Comma-separated list of packages to exclude from camera protection. In our case,
ignore the gaze detection package -->
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index b7599c7..7300e21 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -8,7 +8,7 @@
###############################################################################
# Vendor specific mode to enable FW (RF & SWP) traces.
-STNFC_FW_DEBUG_ENABLED=0
+STNFC_FW_DEBUG_ENABLED=1
###############################################################################
# File used for NFA storage
diff --git a/powerstats/felix/service.cpp b/powerstats/felix/service.cpp
index dd10ef1..0194a54 100644
--- a/powerstats/felix/service.cpp
+++ b/powerstats/felix/service.cpp
@@ -156,15 +156,7 @@
}
std::string getNfcPath() {
- struct stat buffer;
- int size = 128;
- char path[size];
- for (int i = 0; i < 10; i++) {
- std::snprintf(path, size,
- "/sys/devices/platform/10970000.hsi2c/i2c-%d/i2c-st21nfc/power_stats", i);
- if (!stat(path, &buffer)) break;
- }
- return std::string(path);
+ return std::string("/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats");
}
int main() {
diff --git a/vibrator/cs40l26/android.hardware.vibrator-service.cs40l26-private.rc b/vibrator/cs40l26/android.hardware.vibrator-service.cs40l26-private.rc
index 2799cdc..e45356e 100644
--- a/vibrator/cs40l26/android.hardware.vibrator-service.cs40l26-private.rc
+++ b/vibrator/cs40l26/android.hardware.vibrator-service.cs40l26-private.rc
@@ -1,5 +1,5 @@
on property:vendor.all.modules.ready=1
- wait /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_cal_time_ms
+ wait /sys/bus/i2c/devices/15-0043/calibration/redc_cal_time_ms
mkdir /mnt/vendor/persist/haptics 0770 system system
chmod 770 /mnt/vendor/persist/haptics
@@ -9,26 +9,28 @@
chown system system /mnt/vendor/persist/haptics/cs40l26.cal
chown system system /mnt/vendor/persist/haptics/cs40l26_dual.cal
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/f0_stored
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/q_stored
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/redc_stored
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/vibe_state
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/num_waves
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_offset
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/owt_free_space
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_comp_enable
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/redc_comp_enable
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us
- chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/delay_before_stop_playback_us
+ chown system system /sys/bus/i2c/devices/15-0043/calibration/f0_stored
+ chown system system /sys/bus/i2c/devices/15-0043/calibration/q_stored
+ chown system system /sys/bus/i2c/devices/15-0043/calibration/redc_stored
+ chown system system /sys/bus/i2c/devices/15-0043/default/vibe_state
+ chown system system /sys/bus/i2c/devices/15-0043/default/num_waves
+ chown system system /sys/bus/i2c/devices/15-0043/default/f0_offset
+ chown system system /sys/bus/i2c/devices/15-0043/default/owt_free_space
+ chown system system /sys/bus/i2c/devices/15-0043/default/f0_comp_enable
+ chown system system /sys/bus/i2c/devices/15-0043/default/redc_comp_enable
+ chown system system /sys/bus/i2c/devices/15-0043/default/delay_before_stop_playback_us
+
+ chown system system /sys/bus/i2c/devices/15-0042/calibration/f0_stored
+ chown system system /sys/bus/i2c/devices/15-0042/calibration/q_stored
+ chown system system /sys/bus/i2c/devices/15-0042/calibration/redc_stored
+ chown system system /sys/bus/i2c/devices/15-0042/default/vibe_state
+ chown system system /sys/bus/i2c/devices/15-0042/default/num_waves
+ chown system system /sys/bus/i2c/devices/15-0042/default/f0_offset
+ chown system system /sys/bus/i2c/devices/15-0042/default/owt_free_space
+ chown system system /sys/bus/i2c/devices/15-0042/default/f0_comp_enable
+ chown system system /sys/bus/i2c/devices/15-0042/default/redc_comp_enable
+ chown system system /sys/bus/i2c/devices/15-0042/default/delay_before_stop_playback_us
+
chown system system /dev/gpiochip44
enable vendor.vibrator.cs40l26
@@ -46,8 +48,8 @@
setenv CALIBRATION_FILEPATH /mnt/vendor/persist/haptics/cs40l26.cal
setenv CALIBRATION_FILEPATH_DUAL /mnt/vendor/persist/haptics/cs40l26_dual.cal
- setenv HWAPI_PATH_PREFIX /sys/bus/i2c/devices/i2c-cs40l26a/
- setenv HWAPI_PATH_PREFIX_DUAL /sys/bus/i2c/devices/i2c-cs40l26a-dual/
+ setenv HWAPI_PATH_PREFIX /sys/bus/i2c/devices/15-0043/
+ setenv HWAPI_PATH_PREFIX_DUAL /sys/bus/i2c/devices/15-0042/
setenv HWAPI_DEBUG_PATHS "
calibration/f0_stored
calibration/redc_stored
