Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d7145e authored by Rohit Sekhar's avatar Rohit Sekhar
Browse files

Merge remote-tracking branch 'origin/v3.5-a15' into 8895-a15-FP6_loggy_data_34

parents 2ace5e59 93b5715e
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm
BOARD_USES_QCOM_HARDWARE := true
TARGET_BOARD_PLATFORM := volcano

# Screen tap-to-wake
TARGET_POWERHAL_MODE_EXT := $(DEVICE_PATH)/power/power-mode.cpp

# Properties
TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop

+24 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2026  E FOUNDATION

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<exceptions>
    <exception package="com.fps.camera">
        <permission name="android.permission.CAMERA" fixed="false" />
        <permission name="android.permission.RECORD_AUDIO" fixed="false" />
        <permission name="android.permission.READ_MEDIA_IMAGES" fixed="false"/>
        <permission name="android.permission.READ_MEDIA_VIDEO" fixed="false"/>
    </exception>
</exceptions>
+5 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ PRODUCT_COPY_FILES += \

# FPCamera
PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/configs/permissions/privapp-permissions-fpcam.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-fpcam.xml
    $(LOCAL_PATH)/configs/permissions/privapp-permissions-fpcam.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-fpcam.xml \
    $(LOCAL_PATH)/configs/permissions/default-permissions-fpcam.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/default-permissions/default-permissions-fpcam.xml

# Fairphone Moments
$(call inherit-product, external/FairphoneMoments/config.mk)
@@ -228,6 +229,9 @@ $(call soong_config_set,lineage_health,charging_control_charging_path,/sys/class
$(call soong_config_set,lineage_health,charging_control_charging_enabled,0)
$(call soong_config_set,lineage_health,charging_control_charging_disabled,1)
$(call soong_config_set,lineage_health,charging_control_supports_bypass,false)
$(call soong_config_set,lineage_health,fast_charge_node,/sys/class/qcom-battery/chgmod_fcc)
$(call soong_config_set,lineage_health,fast_charge_value_none,1000000)
$(call soong_config_set,lineage_health,fast_charge_value_fast_charge,5800000)

PRODUCT_PACKAGES += \
    vendor.lineage.health-service.default
+6 −0
Original line number Diff line number Diff line
@@ -165,6 +165,12 @@ on post-fs-data
    chown system system /sys/class/leds/aw_vibrator/activate_mode
    chown system system /sys/class/leds/aw_vibrator/gain

# add tap-to-wake
    wait /sys/devices/platform/soc/ac0000.qcom,qupv3_0_geni_se/a80000.spi/spi_master/spi0/spi0.0/gesture_wakeup 20
    chown system system /sys/devices/platform/soc/ac0000.qcom,qupv3_0_geni_se/a80000.spi/spi_master/spi0/spi0.0/gesture_wakeup
    chmod 0660 /sys/devices/platform/soc/ac0000.qcom,qupv3_0_geni_se/a80000.spi/spi_master/spi0/spi0.0/gesture_wakeup
# add tap-to-wake


on early-boot
    verity_update_state
+2 −1
Original line number Diff line number Diff line
@@ -613,3 +613,4 @@ subsystem mem_buf_vm

# Battery
/sys/class/qcom-battery                                 charge_disable                  0660    system  system
/sys/class/qcom-battery                                 chgmod_fcc                      0660    system  system
Loading