diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 94e9394..0000000 --- a/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2011 The Android Open-Source Project -# -# 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. -# - -# WARNING: Everything listed here will be built on ALL platforms, -# including x86, the universal, and the SDK. Modules must be uniquely -# named (liblights.panda), and must build everywhere, or limit themselves -# to only building on ARM if they include assembly. Individual makefiles -# are responsible for having their own logic, for fine-grained control. - -LOCAL_PATH := $(call my-dir) - -# if some modules are built directly from this directory (not subdirectories), -# their rules should be written here. - -ifneq (,$(filter $(TARGET_DEVICE),comet)) - include $(call all-makefiles-under,$(LOCAL_PATH)) -endif diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index e593d7e..6f823bc 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -45,4 +45,4 @@ ThreadDispatcherEnabled = true # A2DP_LDAC_QUALITY_MID 1 // Equal to 660/606(kbps) # A2DP_LDAC_QUALITY_LOW 2 // Equal to 330/303(kbps) # A2DP_LDAC_QUALITY_ABR 3 // ABR mode, range: 990,660,492,396,330(kbps) -LdacDefaultQualityMode = 1 +LdacDefaultQualityMode = 3 diff --git a/device-comet.mk b/device-comet.mk index 394cbd9..1806ff1 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -26,7 +26,12 @@ RELEASE_GOOGLE_BOOTLOADER_COMET_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR) $(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)) +ifdef RELEASE_KERNEL_COMET_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_COMET_VERSION) +else TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_COMET_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_COMET_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_COMET_DIR)/kernel-headers @@ -401,8 +406,8 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# Media Performance Class 15 -PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=35 +# Media Performance Class 14 +PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34 # OIS with system imu PRODUCT_VENDOR_PROPERTIES += \ @@ -453,11 +458,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.enabled=true \ bluetooth.profile.vcp.controller.enabled=true -ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +# Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.source.enabled=true -endif # LE Audio switcher in developer options PRODUCT_PRODUCT_PROPERTIES += \ @@ -489,6 +493,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 +SUPPORT_VENDOR_SATELLITE_SERVICE := true + # Telephony Satellite Feature PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.telephony.satellite.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.satellite.xml diff --git a/factory_comet.mk b/factory_comet.mk index 6797bfd..c72079b 100644 --- a/factory_comet.mk +++ b/factory_comet.mk @@ -45,6 +45,7 @@ PRODUCT_PACKAGES += \ # Factory binary of camera PRODUCT_PACKAGES += fatp_ct3_wide_hat_tool fatp_ct3_tele_hat_tool fatp_ct3_ultrawide_hat_tool +PRODUCT_PACKAGES += fatp_camera_eeprom_inspector PRODUCT_WITHOUT_TTS_VOICE_PACKS := true diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 859944c..d41a982 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -29,6 +29,7 @@ Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_GNSSConstConstraintDef = 0x60FF LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 +Chip_Configuration_ntn_option=2 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index 26d28a7..0641d1f 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -115,6 +115,11 @@ Chip_Configuration_RfMiscCtrl = 0x80008001 #Chip_Configuration_RfMiscCtrl=0x8001 #Chip_Configuration_IspTestConfig=0x22242822 +#Chip_Configuration_ntn_option=0 means no NTN blackout IPC handling +#Chip_Configuration_ntn_option=1 means L1 blanking during NTN blackout period. +#Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period. +Chip_Configuration_ntn_option=2 + # Disable BDS in the U.S. # 0-enabled (default), 1-disabled, 2-auto(disabled in US) #gloUsedInUSPolicy=2 @@ -127,7 +132,7 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 -# Disable MTPL +# MTPL: 0 = Disabled, 1 = Enabled Chip_Configuration_FeatureCfg_MTPL = 1 # MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start) Chip_Configuration_FeatureCfg_SDL_BYASS = 1 diff --git a/powerhint-comet.json b/powerhint-comet.json index 20dcbd4..6877507 100644 --- a/powerhint-comet.json +++ b/powerhint-comet.json @@ -333,7 +333,6 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", - "600", "1" ], "ResetOnInit": true @@ -347,11 +346,21 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAUclampMinOnNiceMidValue", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", "Values": [ "600", + "590", "0" ], "ResetOnInit": true @@ -360,6 +369,7 @@ "Name": "TAUclampMinOnNiceHighPrio", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", "Values": [ + "110", "119", "120" ], @@ -370,6 +380,7 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", "Values": [ "128", + "139", "130" ], "ResetOnInit": true @@ -484,6 +495,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -938,6 +958,7 @@ "102400", "0" ], + "WriteOnly": true, "ResetOnInit": false }, { @@ -1044,12 +1065,6 @@ "Duration": 5000, "Value": "512" }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "765" - }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1233,6 +1248,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1241,9 +1262,33 @@ }, { "PowerHint": "LAUNCH", - "Node": "TAPreferredIdleMaskMid", + "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "0xff" + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "590" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139" }, { "PowerHint": "LAUNCH", @@ -1754,6 +1799,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", @@ -2072,6 +2135,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -2258,6 +2327,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferIdle", @@ -2450,6 +2525,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -2504,6 +2585,18 @@ "Duration": 0, "Value": "4" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2666,6 +2759,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", @@ -3265,7 +3364,7 @@ "PowerHint": "GAME", "Node": "AutoPreferIdle", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "GAME", @@ -3531,6 +3630,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MemFreq", diff --git a/sensors/Android.bp b/sensors/Android.bp new file mode 100644 index 0000000..1ff0b9b --- /dev/null +++ b/sensors/Android.bp @@ -0,0 +1,33 @@ +// Copyright (C) 2009 The Android Open Source Project +// +// 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. + +package { + default_applicable_licenses: [ + "device_google_comet_license", + ], +} + +// HAL module implementation stored in +// hw/..so +cc_library_shared { + name: "sensors.comet", + relative_install_path: "hw", + shared_libs: [ + "liblog", + "libcutils", + "libhardware", + ], + srcs: ["sensors_dummy.c"], + proprietary: true, +} diff --git a/sensors/Android.mk b/sensors/Android.mk deleted file mode 100644 index 60bb82d..0000000 --- a/sensors/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# 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. - -LOCAL_PATH := $(call my-dir) - -# HAL module implementation stored in -# hw/..so -include $(CLEAR_VARS) - -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware -LOCAL_SRC_FILES := sensors_dummy.c -LOCAL_MODULE := sensors.comet -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../NOTICE -LOCAL_PROPRIETARY_MODULE := true - -include $(BUILD_SHARED_LIBRARY)