Snap for 11635697 from 34f09894c1
to 24Q3-release
Change-Id: If80e07456105a5818694360ed4846495a93010be
This commit is contained in:
commit
ac374e1be6
9 changed files with 216 additions and 78 deletions
|
@ -279,6 +279,10 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
persist.vendor.udfps.als_feed_forward_supported=true \
|
||||
persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
|
||||
|
||||
# OIS with system imu
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
persist.vendor.camera.ois_with_system_imu=true
|
||||
|
||||
# Camera Vendor property
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
persist.vendor.camera.front_720P_always_binning=true
|
||||
|
@ -395,3 +399,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
|||
|
||||
# Window Extensions
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
|
||||
|
||||
# Connectivity Resources Overlay
|
||||
PRODUCT_PACKAGES += \
|
||||
ConnectivityResourcesOverlayCaimitoOverride
|
||||
|
|
|
@ -298,6 +298,10 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
persist.vendor.udfps.als_feed_forward_supported=true \
|
||||
persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
|
||||
|
||||
# OIS with system imu
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
persist.vendor.camera.ois_with_system_imu=true
|
||||
|
||||
# Camera Vendor property
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
persist.vendor.camera.front_720P_always_binning=true
|
||||
|
@ -396,3 +400,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
|
|||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
||||
endif
|
||||
|
||||
# Connectivity Resources Overlay
|
||||
PRODUCT_PACKAGES += \
|
||||
ConnectivityResourcesOverlayCaimitoOverride
|
||||
|
|
|
@ -268,6 +268,10 @@ PRODUCT_VENDOR_PROPERTIES += \
|
|||
persist.vendor.udfps.als_feed_forward_supported=true \
|
||||
persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
|
||||
|
||||
# OIS with system imu
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
persist.vendor.camera.ois_with_system_imu=true
|
||||
|
||||
# Camera Vendor property
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
persist.vendor.camera.front_720P_always_binning=true
|
||||
|
@ -366,3 +370,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
|
|||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
||||
endif
|
||||
|
||||
# Connectivity Resources Overlay
|
||||
PRODUCT_PACKAGES += \
|
||||
ConnectivityResourcesOverlayCaimitoOverride
|
||||
|
|
|
@ -2858,12 +2858,24 @@
|
|||
"Duration": 2000,
|
||||
"Value": "44"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPUDVFSHeadroom",
|
||||
"Duration": 0,
|
||||
"Value": "1280"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_LIT_LIMIT_FREQ",
|
||||
"Duration": 0,
|
||||
"Value": "1098000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_LIT_LCPI_THRESHOLD",
|
||||
|
@ -2874,7 +2886,13 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_LIT_SPC_THRESHOLD",
|
||||
"Duration": 0,
|
||||
"Value": "0"
|
||||
"Value": "42"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_MID_LIMIT_FREQ",
|
||||
"Duration": 0,
|
||||
"Value": "1328000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2886,13 +2904,13 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_MID_SPC_THRESHOLD",
|
||||
"Duration": 0,
|
||||
"Value": "50"
|
||||
"Value": "18"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_BIG_LIMIT_FREQ",
|
||||
"Duration": 0,
|
||||
"Value": "1885000"
|
||||
"Value": "1298000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2904,25 +2922,25 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_BIG_SPC_THRESHOLD",
|
||||
"Duration": 0,
|
||||
"Value": "50"
|
||||
"Value": "22"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_POLL",
|
||||
"Duration": 0,
|
||||
"Value": "0"
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "EM_Profile",
|
||||
"Duration": 0,
|
||||
"Value": "cam1"
|
||||
"Value": "cam2"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CDPreferHighCap",
|
||||
"Duration": 0,
|
||||
"Value": "1"
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2934,25 +2952,7 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "TAPreferHighCap",
|
||||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
"Duration": 0,
|
||||
"Value": "1885000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPUMidClusterMaxFreq",
|
||||
"Duration": 0,
|
||||
"Value": "1549000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPULittleClusterMaxFreq",
|
||||
"Duration": 0,
|
||||
"Value": "1425000"
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2984,6 +2984,18 @@
|
|||
"Duration": 0,
|
||||
"Value": "0-7"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "VIRTUAL-SKIN-CPU-MID",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "MIFTargetLoad",
|
||||
|
|
|
@ -2858,12 +2858,24 @@
|
|||
"Duration": 2000,
|
||||
"Value": "44"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPUDVFSHeadroom",
|
||||
"Duration": 0,
|
||||
"Value": "1280"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_LIT_LIMIT_FREQ",
|
||||
"Duration": 0,
|
||||
"Value": "1098000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_LIT_LCPI_THRESHOLD",
|
||||
|
@ -2874,7 +2886,13 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_LIT_SPC_THRESHOLD",
|
||||
"Duration": 0,
|
||||
"Value": "0"
|
||||
"Value": "42"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_MID_LIMIT_FREQ",
|
||||
"Duration": 0,
|
||||
"Value": "1328000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2886,13 +2904,13 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_MID_SPC_THRESHOLD",
|
||||
"Duration": 0,
|
||||
"Value": "50"
|
||||
"Value": "18"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_BIG_LIMIT_FREQ",
|
||||
"Duration": 0,
|
||||
"Value": "1885000"
|
||||
"Value": "1298000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2904,25 +2922,25 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_BIG_SPC_THRESHOLD",
|
||||
"Duration": 0,
|
||||
"Value": "50"
|
||||
"Value": "22"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_POLL",
|
||||
"Duration": 0,
|
||||
"Value": "0"
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "EM_Profile",
|
||||
"Duration": 0,
|
||||
"Value": "cam1"
|
||||
"Value": "cam2"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CDPreferHighCap",
|
||||
"Duration": 0,
|
||||
"Value": "1"
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2934,25 +2952,7 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "TAPreferHighCap",
|
||||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
"Duration": 0,
|
||||
"Value": "1885000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPUMidClusterMaxFreq",
|
||||
"Duration": 0,
|
||||
"Value": "1549000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPULittleClusterMaxFreq",
|
||||
"Duration": 0,
|
||||
"Value": "1425000"
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2984,6 +2984,18 @@
|
|||
"Duration": 0,
|
||||
"Value": "0-7"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "VIRTUAL-SKIN-CPU-MID",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "MIFTargetLoad",
|
||||
|
|
|
@ -2858,12 +2858,24 @@
|
|||
"Duration": 2000,
|
||||
"Value": "44"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPUDVFSHeadroom",
|
||||
"Duration": 0,
|
||||
"Value": "1280"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PowerHALCameraRunning",
|
||||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_LIT_LIMIT_FREQ",
|
||||
"Duration": 0,
|
||||
"Value": "1098000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_LIT_LCPI_THRESHOLD",
|
||||
|
@ -2874,7 +2886,13 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_LIT_SPC_THRESHOLD",
|
||||
"Duration": 0,
|
||||
"Value": "0"
|
||||
"Value": "42"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_MID_LIMIT_FREQ",
|
||||
"Duration": 0,
|
||||
"Value": "1328000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2886,13 +2904,13 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_MID_SPC_THRESHOLD",
|
||||
"Duration": 0,
|
||||
"Value": "50"
|
||||
"Value": "18"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_BIG_LIMIT_FREQ",
|
||||
"Duration": 0,
|
||||
"Value": "1885000"
|
||||
"Value": "1298000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2904,25 +2922,25 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_BIG_SPC_THRESHOLD",
|
||||
"Duration": 0,
|
||||
"Value": "50"
|
||||
"Value": "22"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "PMU_POLL",
|
||||
"Duration": 0,
|
||||
"Value": "0"
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "EM_Profile",
|
||||
"Duration": 0,
|
||||
"Value": "cam1"
|
||||
"Value": "cam2"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CDPreferHighCap",
|
||||
"Duration": 0,
|
||||
"Value": "1"
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2934,25 +2952,7 @@
|
|||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "TAPreferHighCap",
|
||||
"Duration": 0,
|
||||
"Value": "1"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPUBigClusterMaxFreq",
|
||||
"Duration": 0,
|
||||
"Value": "1885000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPUMidClusterMaxFreq",
|
||||
"Duration": 0,
|
||||
"Value": "1549000"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "CPULittleClusterMaxFreq",
|
||||
"Duration": 0,
|
||||
"Value": "1425000"
|
||||
"Value": "0"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
|
@ -2984,6 +2984,18 @@
|
|||
"Duration": 0,
|
||||
"Value": "0-7"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "VIRTUAL-SKIN-CPU-MID",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "VIRTUAL-SKIN-CPU-HIGH",
|
||||
"Duration": 0,
|
||||
"Value": "camera"
|
||||
},
|
||||
{
|
||||
"PowerHint": "CAMERA_PROJECT11",
|
||||
"Node": "MIFTargetLoad",
|
||||
|
|
33
rro_overlays/ConnectivityResourcesOverlayCaimito/Android.bp
Normal file
33
rro_overlays/ConnectivityResourcesOverlayCaimito/Android.bp
Normal file
|
@ -0,0 +1,33 @@
|
|||
//
|
||||
// Copyright (C) 2024 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: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
runtime_resource_overlay {
|
||||
name: "ConnectivityResourcesOverlayCaimito",
|
||||
sdk_version: "current",
|
||||
product_specific: true,
|
||||
resource_dirs: ["res"],
|
||||
}
|
||||
|
||||
override_runtime_resource_overlay {
|
||||
name: "ConnectivityResourcesOverlayCaimitoOverride",
|
||||
base: "ConnectivityResourcesOverlayCaimito",
|
||||
package_name: "com.google.android.connectivity.resources.caimito",
|
||||
target_package_name: "com.google.android.connectivity.resources",
|
||||
}
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Copyright (C) 2024 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.
|
||||
-->
|
||||
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.google.android.connectivity.resources.caimito">
|
||||
<application android:hasCode="false" />
|
||||
<overlay android:targetPackage="com.android.connectivity.resources"
|
||||
android:targetName="ServiceConnectivityResourcesConfig"
|
||||
android:isStatic="true"
|
||||
android:priority="0" />
|
||||
</manifest>
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Copyright (C) 2024 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.
|
||||
-->
|
||||
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<bool name="config_thread_default_enabled">false</bool>
|
||||
</resources>
|
Loading…
Add table
Add a link
Reference in a new issue