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

Commit e9198acb authored by ssizon's avatar ssizon Committed by Romain Hunault
Browse files

FP3: Fix Keymaster 

we need hwservicemanager to start keymaster at an early stage
vold needs to recognise Keymaster HAL:4
This solves the issue : lockscreen password, pin, pattern not saved
parent 30b8402e

BoardConfig.mk

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ TARGET_USES_QTI_CAMERA_DEVICE := true 
MAX_EGL_CACHE_KEY_SIZE := 12*1024

MAX_EGL_CACHE_SIZE := 2048*1024

# MAX_VIRTUAL_DISPLAY_DIMENSION := 4096 #TODO

TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS := true

OVERRIDE_RS_DRIVER := libRSDriver_adreno.so

TARGET_USES_C2D_COMPOSITION := true

TARGET_USES_ION := true
@@ -172,6 +173,9 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 
TARGET_USES_MEDIA_EXTENSIONS := true

TARGET_MOUNT_POINTS_SYMLINKS := false



# DRM

TARGET_ENABLE_MEDIADRM_64 := true



# GPS

TARGET_NO_RPC := true

USE_DEVICE_SPECIFIC_GPS := true

manifest.xml

+9 −9
Original line number Diff line number Diff line
@@ -299,6 +299,15 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>com.qualcomm.qti.dpm.api</name>

        <transport>hwbinder</transport>

        <version>1.0</version>

        <interface>

            <name>IdpmQmi</name>

            <instance>dpmQmiService</instance>

        </interface>

    </hal>

    <hal format="hidl">

        <name>android.hardware.weaver</name>

        <transport>hwbinder</transport>
@@ -380,15 +389,6 @@ 
            <instance>default</instance>

        </interface>

    </hal>

<!--     <hal format="hidl">

        <name>vendor.egistec.hardware.fingerprint</name>

        <transport>hwbinder</transport>

        <version>2.0</version>

        <interface>

            <name>IBiometricsFingerprintEts</name>

            <instance>default</instance>

        </interface>

    </hal> -->

    <hal format="hidl">

        <name>vendor.qti.data.factory</name>

        <transport>hwbinder</transport>

proprietary-files.txt

+26 −8
Original line number Diff line number Diff line
@@ -450,18 +450,26 @@ vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so 
vendor/bin/hw/android.hardware.drm@1.1-service.widevine

vendor/etc/init/android.hardware.drm@1.1-service.widevine.rc

vendor/lib/mediadrm/libwvdrmengine.so

# vendor/lib/liboemcrypto.so

vendor/lib64/libwvhidl.so

vendor/lib64/mediadrm/libwvdrmengine.so

# vendor/lib64/liboemcrypto.so not found

vendor/lib64/libhdcpsrm.so

vendor/lib64/libcpion.so



# DRM

vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so

vendor/lib/com.qualcomm.qti.dpm.api@1.0.so

vendor/bin/qseecomd

vendor/lib/libcppf.so

# vendor/lib/liboemcrypto.so

vendor/lib/libQSEEComAPI.so

vendor/lib/libdrmfs.so

vendor/lib/libdrmtime.so

vendor/lib/libGPreqcancel_svc.so

vendor/lib/libGPreqcancel.so

vendor/lib/libqisl.so

vendor/lib/libQSEEComAPI.so

vendor/lib/librpmb.so

vendor/lib/libSecureUILib.so

vendor/lib/libssd.so

vendor/lib64/libdrmfs.so

vendor/lib64/libdrmtime.so

vendor/lib64/libGPreqcancel_svc.so
@@ -515,6 +523,7 @@ vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so 
vendor/lib64/hw/gatekeeper.msm8953.so



# GPS

vendor/bin/slim_daemon

vendor/bin/hw/vendor.qti.gnss@1.0-service

vendor/bin/DR_AP_Service

vendor/bin/garden_app
@@ -665,8 +674,11 @@ vendor/firmware/leia_pm4_470.fw 
vendor/bin/ipacm-diag



# Keymaster

vendor/bin/hw/android.hardware.keymaster@3.0-service-qti

vendor/bin/hw/android.hardware.keymaster@4.0-service-qti

vendor/etc/init/android.hardware.keymaster@4.0-service-qti.rc

vendor/lib/hw/android.hardware.keymaster@3.0-impl-qti.so

vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so

vendor/lib/hw/keystore.msm8953.so

vendor/lib/libkeymasterdeviceutils.so

vendor/lib/libkeymasterprovision.so
@@ -995,21 +1007,17 @@ vendor/lib64/vendor.qti.imsrtpservice@1.0.so 
vendor/lib64/vendor.qti.imsrtpservice@1.0-service-Impl.so



# Sensors

# vendor/bin/capsense_reset

vendor/bin/sensors.qti

vendor/etc/sensors/sensor_def_qcomdev.conf

vendor/lib/hw/activity_recognition.msm8953.so

vendor/lib/libsensor_reg.so

vendor/lib/libsensor1.so

vendor/lib/sensor_calibrate.so

# vendor/lib/sensors.hal.tof.so

# vendor/lib/sensors.rp.so

vendor/lib/sensors.ssc.so

vendor/lib64/hw/activity_recognition.msm8953.so

vendor/lib64/libsensor_reg.so

vendor/lib64/libsensor1.so

vendor/lib64/sensor_calibrate.so

# vendor/lib64/sensors.hal.tof.so

# vendor/lib64/sensors.rp.so

vendor/lib64/sensors.ssc.so



# Thermal
@@ -1090,9 +1098,19 @@ vendor/bin/ssr_setup 


# SECUREMSM

vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti

vendor/bin/hw/vendor.qti.hardware.qdutils_disp@1.0-service-qti

vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc

vendor/etc/init/vendor.qti.hardware.qdutils_disp@1.0-service-qti.rc

vendor/lib/vendor.qti.hardware.tui_comm@1.0.so

vendor/lib/vendor.qti.hardware.qdutils_disp@1.0.so

vendor/lib/libGPQTEEC_vendor.so

vendor/lib/libQTEEConnector_vendor.so

vendor/lib/libFidoCrypto_vendor.so

vendor/lib64/libGPQTEEC_vendor.so

vendor/lib64/libQTEEConnector_vendor.so

vendor/lib64/libFidoCrypto_vendor.so

vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so

vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0.so

vendor/lib/libsecureui.so

vendor/lib64/libsecureui.so

vendor/lib64/libStDrvInt.so

rootdir/etc/fstab.qcom

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#<src>                                      <mnt_point>  <type>  <mnt_flags and options>                     <fs_mgr_flags>

/dev/block/bootdevice/by-name/system        /            ext4    ro,barrier=1,discard                        wait,slotselect,avb

/dev/block/bootdevice/by-name/userdata      /data        ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard  wait,quota,reservedsize=128M,fileencryption=aes-256-xts:aes-256-cts

/dev/block/bootdevice/by-name/userdata      /data        ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard  latemount,wait,check,quota,reservedsize=128M,fileencryption=ice

#/devices/platform/soc/7864900.sdhci/mmc_host*        /storage/sdcard1 vfat  nosuid,nodev         wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=footer

/devices/platform/soc/7864900.sdhci/mmc_host*        /storage/sdcard1 vfat  nosuid,nodev         wait,voldmanaged=sdcard1:auto,noemulatedsd

/devices/platform/soc/7000000.ssusb/7000000.dwc3/xhci-hcd.0.auto*  /storage/usbotg  vfat  nosuid,nodev  wait,voldmanaged=usbotg:auto

rootdir/etc/init.target.rc

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ on late-fs 
    start vendor.configstore-hal

    start vendor.gralloc-2-0



    # Wait for hwservicemanager ready since fsck might be triggered in mount_all --late

    # In such case, init won't responce the property_set from hwservicemanager and then

    # cause services for bootanim not running.

    wait_for_prop hwservicemanager.ready true



    # mount RW partitions which need run fsck

    mount_all /vendor/etc/fstab.qcom --late