BoardConfigCommon.mk

@@ -10,7 +10,7 @@ COMMON_PATH := device/motorola/sm7325-common
 
 # Architecture
 TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-2a-dotprod
+TARGET_ARCH_VARIANT := armv8-a
 TARGET_CPU_ABI := arm64-v8a
 TARGET_CPU_ABI2 :=
 TARGET_CPU_VARIANT := generic
@@ -175,7 +175,8 @@ BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
 BOARD_AVB_VBMETA_SYSTEM := system system_ext product
 BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
-BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
 
 # WiFi
 BOARD_WLAN_DEVICE := qcwcn

common.mk

@@ -160,12 +160,13 @@ PRODUCT_PACKAGES += \
     android.hardware.gnss@2.1-service-qti \
     gnss@2.0-base.policy \
     gnss@2.0-xtra-daemon.policy \
+    gnss@2.0-xtwifi-client.policy \
     libbatching \
     libgeofencing \
-    libgnss \
+    libgnss
-    libloc_socket
 
 PRODUCT_PACKAGES += \
+    apdr.conf \
     flp.conf \
     gnss_antenna_info.conf \
     gps.conf \
@@ -424,5 +425,8 @@ PRODUCT_PACKAGES += \
     libpng.vendor \
     libwfdaac_vendor
 
+PRODUCT_BOOT_JARS += \
+    WfdCommon
+
 # Inherit from vendor blobs
 $(call inherit-product, vendor/motorola/sm7325-common/sm7325-common-vendor.mk)

device_framework_matrix.xml

@@ -32,7 +32,7 @@
     <hal format="hidl" optional="true">
         <name>motorola.hardware.camera.desktop</name>
         <version>1.0</version>
-        <version>2.0</version>
+		<version>2.0</version>
         <interface>
             <name>ICameraDesktop</name>
             <instance>default</instance>
@@ -62,4 +62,12 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.gnss</name>
+        <version>4.2</version>
+        <interface>
+            <name>ILocHidlGnss</name>
+            <instance>gnss_vendor</instance>
+        </interface>
+    </hal>
 </compatibility-matrix>

extract-files.py

@@ -38,6 +38,8 @@ lib_fixups: lib_fixups_user_type = {
         'libmmosal',
         'vendor.qti.diaghal@1.0',
         'vendor.qti.hardware.fm@1.0',
+        'vendor.qti.hardware.qccsyshal@1.0',
+        'vendor.qti.hardware.qccvndhal@1.0',
         'vendor.qti.hardware.wifidisplaysession@1.0',
         'vendor.qti.imsrtpservice@3.0',
         'vendor.qti.qspmhal@1.0',

gps/etc/Android.bp

@@ -1,3 +1,9 @@
+prebuilt_etc {
+    name: "apdr.conf",
+    vendor: true,
+    src: "apdr.conf",
+}
+
 prebuilt_etc {
 
     name: "flp.conf",
@@ -56,3 +62,10 @@ prebuilt_etc {
     sub_dir: "seccomp_policy",
     src: "seccomp_policy/gnss@2.0-xtra-daemon.policy",
 }
+
+prebuilt_etc {
+    name: "gnss@2.0-xtwifi-client.policy",
+    vendor: true,
+    sub_dir: "seccomp_policy",
+    src: "seccomp_policy/gnss@2.0-xtwifi-client.policy",
+}

gps/etc/apdr.conf

@@ -0,0 +1,188 @@
+# AP DR SENSOR Configuration file
+#
+# SENSOR_SERVICE options are one of below
+#   accel,gyro,vehicle_accel,vehicle_gyro,pedometer,vehicle_odometry,accel_temp,
+#   gyro_temp,baro,mag_calib,mag_uncalib,amd,rmd.
+#
+# SENSOR_PROVIDER options is one of -- default,native,ssc,samlite.
+#
+# SENSOR_RATE = 1~100 (Hz)
+#
+# SENSOR_SAMPLES = 1~N
+#
+# SENSOR_STATISTIC_ENABLED
+#  bit 0: Diag Print Enabled
+#  bit 1: Adb  Print Enabled
+# SENSOR_STATISTIC_PRINT_COUNT
+#  Skip Number of Print
+#
+# QDR_DYNAMIC_LOADING = 1~3
+# Configure QDR library to be loaded
+#   1: QDR3
+#   2: QDR2-GYRO
+#   3: QDR2-DWT
+#
+#
+
+######################################
+#                                    #
+#   QDR3 Configuration               #
+#                                    #
+# For QDR3,                          #
+# comment default configuration above#
+# and                                #
+# uncomment below configuration      #
+# settings.                          #
+#                                    #
+######################################
+#
+SENSOR_SERVICE = accel
+SENSOR_PROVIDER = native
+SENSOR_RATE = 10
+SENSOR_SAMPLES = 10
+#
+SENSOR_SERVICE = vehicle_speed
+SENSOR_PROVIDER = native
+SENSOR_RATE = 100
+SENSOR_SAMPLES = 1
+#
+SENSOR_SERVICE = gyro
+SENSOR_PROVIDER = native
+SENSOR_RATE = 10
+SENSOR_SAMPLES = 10
+#
+SENSOR_SERVICE = vehicle_gear
+SENSOR_PROVIDER = native
+SENSOR_RATE = 100
+SENSOR_SAMPLES = 1
+#
+SENSOR_SERVICE = accel_temp
+SENSOR_PROVIDER = native
+SENSOR_RATE = 1
+SENSOR_SAMPLES = 1
+#
+#
+##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS
+QDR_DYNAMIC_LOADING = 1
+##Specify CAN sensor type: Valid Options: 14(ODO), 2(ODO_DWT), 3(ODO_DWS)
+QDR_CAN_TYPE = 14
+##Reporting offset before PPS boundary
+QDR_REPORTING_OFFSET = 20
+#
+##QDR_ENABLE_QG shall be set as 1
+QDR_ENABLE_QG = 1
+#GEAR Optimisation
+QG_GEAR_ON_CHANGE=1
+#
+
+##Vehicle Sensor Configuration (CAN data availability)
+##QDR_VEH_SENSOR_CONFIG:
+##   0: VEHICLE_SENSOR_PRESENT  - Vehicle Sensor is available (DEFAULT)
+##   1: VEHICLE_SENSOR_OPTIONAL - Vehicle Sensor may or may not be present.
+#QDR_VEH_SENSOR_CONFIG = 0
+
+##Select Wheel set (E.g.: Front two wheels, Rear two wheels OR All four wheels)
+##To be used for differential wheel tick OR speed service.
+##This configuration is applicable when QDR_CAN_TYPE configured as
+##ODO_DWS(3) or ODO_DWT(2).
+##Value "0": Use Front two wheels
+##Value "1": Use Rear two wheels
+##Value "2": Use All four wheels
+#QG_DRIVE_WHEEL_FW_RW_AW = 2
+##Max Wheel tick value above which wheel tick rolls over
+##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2)
+#QG_DWT_MAX_WHEEL_TICK_COUNT = 255.0
+##Configure Wheel constant for DWT based below equation
+##(2 * pi * WHEEL_RADIUS / Pulses Per revolution)
+##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2)
+#QG_DWT_WHEEL_CONSTANT = 0.044
+#
+
+######################################
+#                                    #
+#   QDR2-DWT Configuration           #
+#                                    #
+# For QDR2-DWT,                      #
+# comment default configuration above#
+# and                                #
+# uncomment below configuration      #
+# settings.                          #
+#                                    #
+######################################
+#
+#SENSOR_SERVICE = vehicle_speed
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#SENSOR_STATISTIC_ENABLED = 3
+#SENSOR_STATISTIC_PRINT_COUNT = 50
+#
+#SENSOR_SERVICE = vehicle_dws
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#SENSOR_STATISTIC_ENABLED = 3
+#SENSOR_STATISTIC_PRINT_COUNT = 50
+#
+#SENSOR_SERVICE = vehicle_gear
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#SENSOR_STATISTIC_ENABLED = 3
+#SENSOR_STATISTIC_PRINT_COUNT = 50
+#
+#GNSS_POS_STATISTIC_ENABLED = 3
+#GNSS_POS_STATISTIC_PRNTCNT = 10
+#GNSS_MSR_STATISTIC_ENABLED = 3
+#GNSS_MSR_STATISTIC_PRNTCNT = 10
+#
+##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS
+#QDR_DYNAMIC_LOADING = 3
+##Enable/disable sensor data flashback feature
+#QDR_FLASHBACK_ENABLED = 0
+##Enable/disable sensor data batching feature
+#QDR_BATCHING_ENABLED = 0
+##Reporting offset before PPS boundary
+#QDR_REPORTING_OFFSET = 20
+##Sensor dispatch threshold declaration
+#QDR_SENSDISPATCH_MS = 30
+
+
+######################################
+#                                    #
+#   QDR2-GYRO Configuration          #
+#                                    #
+# For QDR2-GYRO,                     #
+# comment default configuration above#
+# and                                #
+# uncomment below configuration      #
+# settings.                          #
+#                                    #
+######################################
+#
+#SENSOR_SERVICE = vehicle_speed
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#
+#SENSOR_SERVICE = vehicle_gyro
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#
+#SENSOR_SERVICE = vehicle_gear
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#
+##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS
+#QDR_DYNAMIC_LOADING = 2
+##Enable/disable sensor data flashback feature
+#QDR_FLASHBACK_ENABLED = 0
+##Enable/disable sensor data batching feature
+#QDR_BATCHING_ENABLED = 0
+##Reporting offset before PPS boundary
+#QDR_REPORTING_OFFSET = 20
+##Sensor dispatch threshold declaration
+#QDR_SENSDISPATCH_MS = 30
+#

gps/etc/izat.conf

@@ -187,7 +187,7 @@ VENDOR_ENHANCED_PROCESS=0
 
 PROCESS_NAME=xtwifi-inet-agent
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=inet gps
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xc03
@@ -200,7 +200,7 @@ VENDOR_ENHANCED_PROCESS=1
 
 PROCESS_NAME=xtwifi-client
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=wifi inet gps system oem_2904
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xd03
@@ -213,7 +213,7 @@ VENDOR_ENHANCED_PROCESS=1
 
 PROCESS_NAME=slim_daemon
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=gps oem_2901 can plugdev diag sensors
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xf0

gps/etc/seccomp_policy/gnss@2.0-xtwifi-client.policy

@@ -0,0 +1,83 @@
+
+#*******************************************************************************
+#  Copyright (c) 2020 The Linux Foundation. All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are
+#  met:
+#      * Redistributions of source code must retain the above copyright
+#        notice, this list of conditions and the following disclaimer.
+#      * Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials provided
+#        with the distribution.
+#      * Neither the name of The Linux Foundation, nor the names of its
+#        contributors may be used to endorse or promote products derived
+#        from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+#  ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+#  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+#  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+#  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+#  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#******************************************************************************
+
+#******************************************************************************
+# Changes from Qualcomm Innovation Center are provided under the following license:
+# Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+#
+#******************************************************************************
+
+fdatasync: 1
+getdents64: 1
+gettimeofday: 1
+ioctl: 1
+lseek: 1
+madvise: 1
+mkdirat: 1
+pwrite64: 1
+
+timerfd_create: 1
+timerfd_settime: 1
+epoll_create1: 1
+epoll_pwait: 1
+epoll_ctl: 1
+
+sched_getaffinity: 1
+gettid: 1
+fchown: 1
+fchmod: 1
+fchmodat: 1
+getsockopt: 1
+fchownat: 1
+fstat: 1
+fstatfs: 1
+newfstatat: 1
+sendmsg: 1
+recvmsg: 1
+gettimeofday: 1
+setsockopt: 1
+rt_tgsigqueueinfo: 1
+ioctl: 1
+mmap: 1
+getuid32: 1
+getuid: 1
+fstat64: 1
+fstatat64: 1
+mkdir: 1
+rmdir: 1
+creat: 1
+chmod: 1
+lseek: 1
+geteuid32: 1
+getrlimit: 1
+shutdown: 1
+

lineage.dependencies

@@ -0,0 +1,10 @@
+[
+  {
+    "repository": "android_kernel_motorola_sm7325",
+    "target_path": "kernel/motorola/sm7325"
+  },
+  {
+    "repository": "android_hardware_motorola",
+    "target_path": "hardware/motorola"
+  }
+]

proprietary-files.txt

@@ -128,12 +128,6 @@ vendor/lib64/libbt-hidlclient.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so
 
-# CACert
-vendor/app/CACertService/CACertService.apk
-vendor/lib64/libcacertclient.so
-vendor/lib64/libjnihelper.so
-vendor/lib64/vendor.qti.hardware.cacert@1.0.so
-
 # CDSP
 vendor/bin/cdsprpcd
 vendor/etc/init/vendor.qti.cdsprpc-service.rc
@@ -152,6 +146,7 @@ vendor/etc/charger_fw_fstab.qti
 vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc
 
 # CNE
+vendor/app/CACertService/CACertService.apk
 vendor/app/CneApp/CneApp.apk;REQUIRED=CneApp.libvndfwk_detect_jni.qti_symlink
 vendor/app/IWlanService/IWlanService.apk
 vendor/bin/cnd
@@ -190,6 +185,7 @@ vendor/lib/libxml.so
 vendor/lib64/libcne.so;DISABLE_CHECKELF
 vendor/lib64/libcneapiclient.so
 vendor/lib64/libcneoplookup.so
+vendor/lib64/libjnihelper.so
 vendor/lib64/libwms.so
 vendor/lib64/libwqe.so;DISABLE_CHECKELF
 vendor/lib64/libxml.so
@@ -199,6 +195,7 @@ vendor/lib64/vendor.qti.data.factory@2.2.so
 vendor/lib64/vendor.qti.data.factory@2.3.so
 vendor/lib64/vendor.qti.data.mwqem@1.0.so
 vendor/lib64/vendor.qti.data.slm@1.0.so
+vendor/lib64/vendor.qti.hardware.cacert@1.0.so
 vendor/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so
 vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so
 vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so
@@ -387,24 +384,28 @@ vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so
 # GNSS
 vendor/bin/loc_launcher
 vendor/bin/lowi-server;DISABLE_CHECKELF
+vendor/bin/mlid
 vendor/bin/xtra-daemon
 vendor/etc/vintf/manifest/vendor.qti.gnss@4.2-service.xml
 vendor/lib64/hw/vendor.qti.gnss@4.2-impl.so
 vendor/lib64/libaoa.so
+vendor/lib64/libcacertclient.so
 vendor/lib64/libcdfw.so
 vendor/lib64/libcdfw_remote_api.so
 vendor/lib64/libdataitems.so
+vendor/lib64/libgdtap.so
 vendor/lib64/libizat_client_api.so
 vendor/lib64/libizat_core.so
 vendor/lib64/liblbs_core.so
 vendor/lib64/libloc_api_v02.so
-vendor/lib64/libloc_api_wds.so
+vendor/lib64/libloc_socket.so
 vendor/lib64/liblocationservice.so
 vendor/lib64/liblocationservice_glue.so
 vendor/lib64/liblowi_client.so
-vendor/lib64/libqcc_file_agent.so
+vendor/lib64/liblowi_wifihal.so
+vendor/lib64/libminksocket.so
+vendor/lib64/libslimclient.so
 vendor/lib64/libxtadapter.so
-vendor/lib64/qcril_client.so
 vendor/lib64/vendor.qti.gnss@1.0.so
 vendor/lib64/vendor.qti.gnss@1.1.so
 vendor/lib64/vendor.qti.gnss@1.2.so
@@ -540,10 +541,6 @@ vendor/lib/libqcodec2_utils.so
 vendor/lib/libqcodec2_v4l2codec.so
 vendor/lib64/libmmosal.so;MODULE_SUFFIX=_vendor
 
-# Mink-Lowi Interface daemon
-vendor/bin/mlid
-vendor/lib64/libminksocket.so
-
 # Neural networks
 vendor/lib64/libQnnHtp.so
 vendor/lib64/libQnnHtpV68Stub.so
@@ -625,8 +622,21 @@ vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc|a03a9a1c818595b19272ea6
 vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so|0b5b86c7ea668197244b83dad4d686897b5e4fb4
 vendor/lib64/vendor.qti.hardware.alarm@1.0.so|8956937951c6f99727ace3380f46275e62c932c0
 
-# QCC
+# QCC - System
-vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so
+system_ext/bin/qccsyshal@1.2-service
+system_ext/etc/init/vendor.qti.hardware.qccsyshal@1.2-service.rc
+system_ext/lib64/libqcc_file_agent_sys.so
+system_ext/lib64/vendor.qti.hardware.qccsyshal@1.0.so
+system_ext/lib64/vendor.qti.hardware.qccsyshal@1.1.so
+system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2-halimpl.so
+system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so
+system_ext/lib64/vendor.qti.hardware.qccvndhal@1.0.so
+system_ext/lib64/vendor.qti.qccvndhal_aidl-V1-ndk.so
+
+# QCC - vendor
+vendor/lib64/libqcc_file_agent.so
+vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so;MODULE_SUFFIX=_vendor
+vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so;MODULE_SUFFIX=_vendor
 
 # QMI
 system/etc/permissions/privapp-permissions-qti.xml
@@ -831,6 +841,7 @@ vendor/lib64/librilqmimiscservices.so
 vendor/lib64/librilqmiservices.so
 vendor/lib64/libsystem_health_mon.so
 vendor/lib64/qcrilMarshal.so
+vendor/lib64/qcril_client.so
 vendor/lib64/qcrild_libqcrilnrutils.so
 vendor/lib64/qtiril-utils.so
 vendor/lib64/qtiwakelock.so
@@ -1122,7 +1133,7 @@ vendor/etc/wifi/aoa_cldb_falcon.bin
 vendor/etc/wifi/aoa_cldb_swl14.bin
 
 # WiFi Display
-system/framework/WfdCommon.jar;BOOT_JAR
+system/framework/WfdCommon.jar
 system_ext/bin/wfdservice
 system_ext/etc/init/wfdservice.rc
 system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml