Evolution-X-Tensor/device_google_raviole
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Browse source 
Bug: 337098550
Merged-In: Id59e87e47845cbb2187588f623f1e981c0bfd3da
Change-Id: Ic2c3da23ae97392047b91e8d378d238e39abeb94
This commit is contained in:
Xin Li 2024-05-06 12:09:16 -07:00
commit d76ec15e36
39 changed files with 117 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

2
audio/oriole/config/audio_policy_configuration.xml
View file

@ -94,7 +94,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall capture" role="sink"> <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/> channelMasks="AUDIO_CHANNEL_IN_MONO"/>

2
audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -94,7 +94,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall capture" role="sink"> <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/> channelMasks="AUDIO_CHANNEL_IN_MONO"/>

2
audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
View file

@ -90,7 +90,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall capture" role="sink"> <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/> channelMasks="AUDIO_CHANNEL_IN_MONO"/>

2
audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml
View file

@ -94,7 +94,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall capture" role="sink"> <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/> channelMasks="AUDIO_CHANNEL_IN_MONO"/>

2
audio/raven/config/audio_policy_configuration.xml
View file

@ -94,7 +94,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall capture" role="sink"> <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/> channelMasks="AUDIO_CHANNEL_IN_MONO"/>

2
audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -94,7 +94,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall capture" role="sink"> <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/> channelMasks="AUDIO_CHANNEL_IN_MONO"/>

2
audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
View file

@ -90,7 +90,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall capture" role="sink"> <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/> channelMasks="AUDIO_CHANNEL_IN_MONO"/>

2
audio/raven/config/audio_policy_configuration_le_offload_disabled.xml
View file

@ -94,7 +94,7 @@
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/> channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall capture" role="sink"> <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" samplingRates="48000"
channelMasks="AUDIO_CHANNEL_IN_MONO"/> channelMasks="AUDIO_CHANNEL_IN_MONO"/>

4
conf/init.oriole.rc
View file

@ -3,10 +3,8 @@ import /vendor/etc/init/hw/init.gs101.rc
import /vendor/etc/init/hw/init.raviole.rc import /vendor/etc/init/hw/init.raviole.rc
on init on init
# logbuffer
chown system system /dev/logbuffer_5-0057
# nvmem dump # nvmem dump
chown system system /sys/bus/nvmem/devices/4-00500/nvmem chown system system /sys/bus/nvmem/devices/8-00500/nvmem
on init && property:ro.boot.vh_sched_available=0 on init && property:ro.boot.vh_sched_available=0
setprop vendor.powerhal.config powerhint-mainline.json setprop vendor.powerhal.config powerhint-mainline.json

4
conf/init.raven.rc
View file

@ -3,10 +3,8 @@ import /vendor/etc/init/hw/init.gs101.rc
import /vendor/etc/init/hw/init.raviole.rc import /vendor/etc/init/hw/init.raviole.rc
on init on init
# logbuffer
chown system system /dev/logbuffer_5-0057
# nvmem dump # nvmem dump
chown system system /sys/bus/nvmem/devices/5-00500/nvmem chown system system /sys/bus/nvmem/devices/8-00500/nvmem
# Power Stats HAL # Power Stats HAL
chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats chown system system /sys/devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power_stats

4
conf/init.slider.rc
View file

@ -10,10 +10,6 @@ on init
on init && property:ro.build.flavor=factory_slider-userdebug on init && property:ro.build.flavor=factory_slider-userdebug
import /vendor/etc/init/hw/init.factory.rc import /vendor/etc/init/hw/init.factory.rc
on init
# logbuffer
chown system system /dev/logbuffer_6-0057
on early-boot on early-boot
# Wait for insmod_sh to finish all common modules # Wait for insmod_sh to finish all common modules
wait_for_prop vendor.common.modules.ready 1 wait_for_prop vendor.common.modules.ready 1

15
device-oriole.mk
View file

@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/raviole-kernel TARGET_KERNEL_DIR ?= device/google/raviole-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers
endif
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/proprietary/device-vendor.mk)
@ -41,7 +50,7 @@ include device/google/gs-common/touch/stm/stm11.mk
GOODIX_CONFIG_BUILD_VERSION := g6_trusty GOODIX_CONFIG_BUILD_VERSION := g6_trusty
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2
else else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk
@ -199,7 +208,7 @@ endif
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=75 ro.vendor.build.svn=78
# Set support hide display cutout feature # Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -239,7 +248,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
else else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk

15
device-raven.mk
View file

@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
TARGET_KERNEL_DIR ?= device/google/raviole-kernel TARGET_KERNEL_DIR ?= device/google/raviole-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION)
endif
ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR
TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
endif
$(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk) $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk)
$(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk) $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-raven.mk)
$(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/gs101/prebuilts/device-vendor.mk)
@ -41,7 +50,7 @@ include device/google/gs-common/touch/lsi/lsi.mk
GOODIX_CONFIG_BUILD_VERSION := g6_trusty GOODIX_CONFIG_BUILD_VERSION := g6_trusty
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2
else else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk
@ -203,7 +212,7 @@ endif
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=75 ro.vendor.build.svn=78
# Set support hide display cutout feature # Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -247,7 +256,7 @@ PRODUCT_PACKAGES += \
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
else else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk

2
device-slider.mk
View file

@ -107,7 +107,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
else else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk

2
device-whitefin.mk
View file

@ -90,7 +90,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
else else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk

1
init.insmod.oriole.cfg
View file

@ -9,6 +9,7 @@
modprobe|bcmdhd4389.ko modprobe|bcmdhd4389.ko
modprobe|ftm5.ko modprobe|ftm5.ko
modprobe|sec_touch.ko modprobe|sec_touch.ko
modprobe|st33spi.ko
# All device specific modules loaded # All device specific modules loaded
setprop|vendor.device.modules.ready setprop|vendor.device.modules.ready

1
init.insmod.raven.cfg
View file

@ -8,6 +8,7 @@
# Modules here will be loaded *after* all common modules # Modules here will be loaded *after* all common modules
modprobe|bcmdhd4389.ko modprobe|bcmdhd4389.ko
modprobe|sec_touch.ko modprobe|sec_touch.ko
modprobe|st33spi.ko
# All device specific modules loaded # All device specific modules loaded
setprop|vendor.device.modules.ready setprop|vendor.device.modules.ready

4
location/gps.xml
View file

@ -59,7 +59,7 @@
CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true" CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false" ReAidingOnHotStart="false"
ReAidingIntervalSec="1200" ReAidingIntervalSec="3600"
PpsDevice="/sys/class/pps/pps0/assert_elapsed" PpsDevice="/sys/class/pps/pps0/assert_elapsed"
SensorsMask="0x244" SensorsMask="0x244"
MaxThreadNum="13" MaxThreadNum="13"
@ -92,6 +92,8 @@
MinGpsWeekNumber="2216" MinGpsWeekNumber="2216"
OnChipAccMask="50" OnChipAccMask="50"
EnableB1C="false" EnableB1C="false"
RTICacheTimeoutSec="3600"
/> />
<gll_features <gll_features

4
location/gps.xml.oriole
View file

@ -59,7 +59,7 @@
CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true" CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false" ReAidingOnHotStart="false"
ReAidingIntervalSec="1200" ReAidingIntervalSec="3600"
PpsDevice="/sys/class/pps/pps0/assert_elapsed" PpsDevice="/sys/class/pps/pps0/assert_elapsed"
SensorsMask="0x244" SensorsMask="0x244"
MaxThreadNum="13" MaxThreadNum="13"
@ -92,6 +92,8 @@
MinGpsWeekNumber="2216" MinGpsWeekNumber="2216"
OnChipAccMask="50" OnChipAccMask="50"
EnableB1C="false" EnableB1C="false"
RTICacheTimeoutSec="3600"
/> />
<gll_features <gll_features

4
location/gps.xml.raven
View file

@ -59,7 +59,7 @@
CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true" CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false" ReAidingOnHotStart="false"
ReAidingIntervalSec="1200" ReAidingIntervalSec="3600"
PpsDevice="/sys/class/pps/pps0/assert_elapsed" PpsDevice="/sys/class/pps/pps0/assert_elapsed"
SensorsMask="0x244" SensorsMask="0x244"
MaxThreadNum="13" MaxThreadNum="13"
@ -92,6 +92,8 @@
MinGpsWeekNumber="2216" MinGpsWeekNumber="2216"
OnChipAccMask="50" OnChipAccMask="50"
EnableB1C="false" EnableB1C="false"
RTICacheTimeoutSec="3600"
/> />
<gll_features <gll_features

4
location/gps_user.xml
View file

@ -58,7 +58,7 @@
CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true" CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false" ReAidingOnHotStart="false"
ReAidingIntervalSec="1200" ReAidingIntervalSec="3600"
PpsDevice="/sys/class/pps/pps0/assert_elapsed" PpsDevice="/sys/class/pps/pps0/assert_elapsed"
SensorsMask="0x244" SensorsMask="0x244"
MaxThreadNum="13" MaxThreadNum="13"
@ -91,6 +91,8 @@
MinGpsWeekNumber="2216" MinGpsWeekNumber="2216"
OnChipAccMask="50" OnChipAccMask="50"
EnableB1C="false" EnableB1C="false"
RTICacheTimeoutSec="3600"
/> />
<gll_features <gll_features

4
location/gps_user.xml.oriole
View file

@ -58,7 +58,7 @@
CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true" CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false" ReAidingOnHotStart="false"
ReAidingIntervalSec="1200" ReAidingIntervalSec="3600"
PpsDevice="/sys/class/pps/pps0/assert_elapsed" PpsDevice="/sys/class/pps/pps0/assert_elapsed"
SensorsMask="0x244" SensorsMask="0x244"
MaxThreadNum="13" MaxThreadNum="13"
@ -91,6 +91,8 @@
MinGpsWeekNumber="2216" MinGpsWeekNumber="2216"
OnChipAccMask="50" OnChipAccMask="50"
EnableB1C="false" EnableB1C="false"
RTICacheTimeoutSec="3600"
/> />
<gll_features <gll_features

4
location/gps_user.xml.raven
View file

@ -58,7 +58,7 @@
CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true" CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false" ReAidingOnHotStart="false"
ReAidingIntervalSec="1200" ReAidingIntervalSec="3600"
PpsDevice="/sys/class/pps/pps0/assert_elapsed" PpsDevice="/sys/class/pps/pps0/assert_elapsed"
SensorsMask="0x244" SensorsMask="0x244"
MaxThreadNum="13" MaxThreadNum="13"
@ -91,6 +91,8 @@
MinGpsWeekNumber="2216" MinGpsWeekNumber="2216"
OnChipAccMask="50" OnChipAccMask="50"
EnableB1C="false" EnableB1C="false"
RTICacheTimeoutSec="3600"
/> />
<gll_features <gll_features

2
nfc/libnfc-hal-st.conf
View file

@ -8,7 +8,7 @@ NFC_DEBUG_ENABLED=0
############################################################################### ###############################################################################
# Vendor specific mode to enable FW (RF & SWP) traces. # Vendor specific mode to enable FW (RF & SWP) traces.
STNFC_FW_DEBUG_ENABLED=0 STNFC_FW_DEBUG_ENABLED=1
############################################################################### ###############################################################################
# File used for NFA storage # File used for NFA storage

2
oriole/BoardConfig.mk
View file

@ -26,7 +26,7 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk

3
oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
View file

@ -52,5 +52,8 @@
<!-- Offset should not be more than 1mm --> <!-- Offset should not be more than 1mm -->
<dimen name="udfps_burn_in_offset_y">16px</dimen> <dimen name="udfps_burn_in_offset_y">16px</dimen>
<!-- Pixel pitch of the device. um/px -->
<item name="pixel_pitch" format="float" type="dimen">61.8</item>
</resources> </resources>

1
oriole/rro_overlays/NfcOverlay/res/values/config.xml
View file

@ -32,4 +32,5 @@
<integer-array name="antenna_y"> <integer-array name="antenna_y">
<item>106</item> <item>106</item>
</integer-array> </integer-array>
<bool name="nfc_observe_mode_supported">true</bool>
</resources> </resources>

2
powerhint-oriole.json
View file

@ -122,7 +122,7 @@
}, },
{ {
"Name": "CPUBigClusterDownRateLimitUs", "Name": "CPUBigClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [ "Values": [
"20000", "20000",
"3000" "3000"

2
powerhint-raven.json
View file

@ -121,7 +121,7 @@
}, },
{ {
"Name": "CPUBigClusterDownRateLimitUs", "Name": "CPUBigClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [ "Values": [
"20000", "20000",
"3000" "3000"

2
powerhint-slider.json
View file

@ -121,7 +121,7 @@
}, },
{ {
"Name": "CPUBigClusterDownRateLimitUs", "Name": "CPUBigClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [ "Values": [
"20000", "20000",
"3000" "3000"

2
powerhint-whitefin.json
View file

@ -121,7 +121,7 @@
}, },
{ {
"Name": "CPUBigClusterDownRateLimitUs", "Name": "CPUBigClusterDownRateLimitUs",
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us", "Path": "/sys/devices/system/cpu/cpu6/cpufreq/sched_pixel/down_rate_limit_us",
"Values": [ "Values": [
"20000", "20000",
"3000" "3000"

21
powerstats/oriole/service.cpp
View file

@ -41,6 +41,12 @@ std::map<std::string, std::string> displayChannelNames = {
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats // Add display residency stats
struct stat buffer;
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state exists
addDisplayMrr(p);
} else {
// time_in_state doesn't exist
std::vector<std::string> states = { std::vector<std::string> states = {
"Off", "Off",
"LP: 1080x2400@30", "LP: 1080x2400@30",
@ -52,6 +58,7 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display", p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
"/sys/class/backlight/panel0-backlight/state", "/sys/class/backlight/panel0-backlight/state",
states)); states));
}
std::string rev = android::base::GetProperty(kBootRevision, ""); std::string rev = android::base::GetProperty(kBootRevision, "");
@ -87,18 +94,8 @@ int main() {
addGs101CommonDataProviders(p); addGs101CommonDataProviders(p);
addDisplay(p); addDisplay(p);
if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats");
} else {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-8/i2c-st21nfc/power_stats");
} }
const std::string instance = std::string() + PowerStats::descriptor + "/default"; const std::string instance = std::string() + PowerStats::descriptor + "/default";
binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());

21
powerstats/raven/service.cpp
View file

@ -43,6 +43,12 @@ std::map<std::string, std::string> displayChannelNames = {
void addDisplay(std::shared_ptr<PowerStats> p) { void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats // Add display residency stats
struct stat buffer;
if (!stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state exists
addDisplayMrr(p);
} else {
// time_in_state doesn't exist
std::vector<std::string> states = { std::vector<std::string> states = {
"Off", "Off",
"LP: 1440x3120@10", "LP: 1440x3120@10",
@ -58,6 +64,7 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display", p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
"/sys/class/backlight/panel0-backlight/state", "/sys/class/backlight/panel0-backlight/state",
states)); states));
}
std::string rev = android::base::GetProperty(kBootRevision, ""); std::string rev = android::base::GetProperty(kBootRevision, "");
@ -129,18 +136,8 @@ int main() {
addGs101CommonDataProviders(p); addGs101CommonDataProviders(p);
addDisplay(p); addDisplay(p);
if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats");
} else {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-8/i2c-st21nfc/power_stats");
} }
const std::string instance = std::string() + PowerStats::descriptor + "/default"; const std::string instance = std::string() + PowerStats::descriptor + "/default";
binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());

14
powerstats/slider/service.cpp
View file

@ -70,18 +70,8 @@ int main() {
addGs101CommonDataProviders(p); addGs101CommonDataProviders(p);
addDisplay(p); addDisplay(p);
if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats");
} else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats");
} else {
addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-8/i2c-st21nfc/power_stats");
} }
const std::string instance = std::string() + PowerStats::descriptor + "/default"; const std::string instance = std::string() + PowerStats::descriptor + "/default";
binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());

2
raven/BoardConfig.mk
View file

@ -26,7 +26,7 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk

3
raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
View file

@ -59,5 +59,8 @@
<!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. --> <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. -->
<dimen name="lock_icon_padding">68px</dimen> <dimen name="lock_icon_padding">68px</dimen>
<!-- Pixel pitch of the device. um/px -->
<item name="pixel_pitch" format="float" type="dimen">49.6</item>
</resources> </resources>

1
raven/rro_overlays/NfcOverlay/res/values/config.xml
View file

@ -32,4 +32,5 @@
<integer-array name="antenna_y"> <integer-array name="antenna_y">
<item>106</item> <item>106</item>
</integer-array> </integer-array>
<bool name="nfc_observe_mode_supported">true</bool>
</resources> </resources>

2
slider/BoardConfig.mk
View file

@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := slider TARGET_BOOTLOADER_BOARD_NAME := slider
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk

2
whitefin/BoardConfig.mk
View file

@ -17,7 +17,7 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := whitefin TARGET_BOOTLOADER_BOARD_NAME := whitefin
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
else else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk