From 7afe66f80de184d01ad60b7d4ad168e2562baaed Mon Sep 17 00:00:00 2001 From: Qian-Hao Huang Date: Thu, 2 May 2024 20:58:23 +0800 Subject: [PATCH 1/2] Load fips140.ko before all other kernel modules Bug: 337838109 Bug: 331791671 Change-Id: I65c3fde7fd179b506a5a2eea45b7c2ef7a7fa956 Signed-off-by: Qian-Hao Huang --- akita/BoardConfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/akita/BoardConfig.mk b/akita/BoardConfig.mk index 9f9065e..3567a03 100644 --- a/akita/BoardConfig.mk +++ b/akita/BoardConfig.mk @@ -18,6 +18,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 From cf048bff49c0246bbc071465e2a72bd7d412abf4 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Fri, 3 May 2024 12:18:52 +0800 Subject: [PATCH 2/2] gps: update gps configuration disable requestRefLocCb to prevent incorrect cell info re-enabling OTDOA Bug: 336760721 Bug: 329779403 Test: Config change works Change-Id: Ia92f06403c11dd04776be768b5087526b589ffb3 --- location/gnssd/release/gps.cfg | 2 +- location/gnssd/release/gps_user.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg index 2438852..ddfafe2 100644 --- a/location/gnssd/release/gps.cfg +++ b/location/gnssd/release/gps.cfg @@ -160,6 +160,7 @@ GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 +GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=5 @@ -227,7 +228,6 @@ ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 # VZW GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_UT2_SEC=10 diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg index 45800c3..6936a8c 100644 --- a/location/gnssd/release/gps_user.cfg +++ b/location/gnssd/release/gps_user.cfg @@ -51,6 +51,7 @@ GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 +GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=5 @@ -107,7 +108,6 @@ ENABLE_NLP_IN_LPPE=0 ENABLE_NLP_IN_AGNSS=1 ENABLE_LPP_HA_GAD_SHAPE=1 GNSS_CARRIER_ID=3 -ENABLE_CAPS_OTDOA=0 ENABLE_LPP_UP=1 ENABLE_LPPE_UP=3 SUPL_UT2_SEC=10