Snap for 10017868 from 68a22b0503 to udc-qpr1-release

Change-Id: I3da432cde9e2faeddfa04fbc51f9438c383f8edb
This commit is contained in:
Android Build Coastguard Worker 2023-04-28 01:06:21 +00:00
commit 9365a15a53
6 changed files with 80 additions and 25 deletions

3
OWNERS
View file

@ -1 +1,4 @@
per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com
# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS

View file

@ -77,7 +77,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.camera.extended_launch_boost=1 \
persist.vendor.camera.raise_buf_allocation_priority=1 \
persist.vendor.camera.fixed_fps_range_boost=1
persist.vendor.camera.fixed_fps_range_boost=1 \
vendor.camera.multicam.enable_p23_multicam=true
# Display Config
PRODUCT_COPY_FILES += \
@ -243,7 +244,5 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PRODUCT_PROPERTIES ?= \
ro.com.google.ime.height_ratio=1.05
# Setup Wizard device-specific settings
PRODUCT_PRODUCT_PROPERTIES += \
setupwizard.feature.enable_quick_start_flow_for_debug=true \
# UFS: the script is used to select the corresponding firmware to run FFU.
PRODUCT_PACKAGES += ufs_firmware_update.sh

View file

@ -143,7 +143,7 @@
"Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min",
"Values": [
"553",
"692",
"1"
],
"ResetOnInit": true
@ -152,7 +152,7 @@
"Name": "FGUClampBoost",
"Path": "/proc/vendor_sched/fg_uclamp_min",
"Values": [
"161",
"202",
"0"
],
"ResetOnInit": true
@ -161,8 +161,8 @@
"Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min",
"Values": [
"180",
"512"
"225",
"640"
],
"DefaultIndex": 0,
"ResetOnInit": true
@ -541,13 +541,13 @@
"PowerHint": "LAUNCH",
"Node": "TAUClampBoost",
"Duration": 5000,
"Value": "553"
"Value": "692"
},
{
"PowerHint": "LAUNCH",
"Node": "FGUClampBoost",
"Duration": 5000,
"Value": "161"
"Value": "202"
},
{
"PowerHint": "LAUNCH",
@ -1855,7 +1855,7 @@
"PowerHint": "ML_ACC",
"Node": "MLUclampBoost",
"Duration": 2000,
"Value": "512"
"Value": "640"
}
],
"AdpfConfig": [
@ -1871,8 +1871,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 185,
"UclampMin_High": 384,
"UclampMin_Init": 232,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@ -1895,8 +1895,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 129,
"UclampMin_High": 384,
"UclampMin_Init": 162,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@ -1919,8 +1919,8 @@
"PID_Do": 500.0,
"PID_Du": 0.0,
"UclampMin_On": true,
"UclampMin_Init": 129,
"UclampMin_High": 384,
"UclampMin_Init": 162,
"UclampMin_High": 480,
"UclampMin_Low": 2,
"SamplingWindow_P": 1,
"SamplingWindow_I": 0,
@ -1946,9 +1946,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 200,
"UclampMin_High": 157,
"UclampMin_Low": 157,
"UclampMin_Init": 250,
"UclampMin_High": 197,
"UclampMin_Low": 197,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@ -1970,9 +1970,9 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 200,
"UclampMin_High": 42,
"UclampMin_Low": 42,
"UclampMin_Init": 250,
"UclampMin_High": 53,
"UclampMin_Low": 53,
"ReportingRateLimitNs": 1,
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
@ -1994,7 +1994,7 @@
"SamplingWindow_I": 1,
"SamplingWindow_D": 1,
"UclampMin_On": true,
"UclampMin_Init": 200,
"UclampMin_Init": 250,
"UclampMin_High": 0,
"UclampMin_Low": 0,
"ReportingRateLimitNs": 1,

27
storage/Android.bp Normal file
View file

@ -0,0 +1,27 @@
//
// Copyright (C) 2017 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/bluejay:device_google_bluejay_license",
],
}
sh_binary {
name: "ufs_firmware_update.sh",
src: "ufs_firmware_update.sh",
init_rc: ["storage.bluejay.rc"],
vendor: true,
}

View file

@ -0,0 +1,7 @@
on property:sys.boot_completed=1
# Copy ufs firmware to disk
start ufs_firmware_update
service ufs_firmware_update /vendor/bin/ufs_firmware_update.sh
disabled
oneshot

19
storage/ufs_firmware_update.sh Executable file
View file

@ -0,0 +1,19 @@
#!/vendor/bin/sh
#
# The script belongs to the feature of UFS FFU via OTA: go/p23-ffu-ota
# Its purpose is to copy the corresponding firmware into partition for UFS FFU.
ufs_dev="/dev/sys/block/bootdevice"
fw_dir="/vendor/firmware"
blk_dev="/dev/block/by-name/fips"
vendor=$(cat ${ufs_dev}/vendor | tr -d "[:space:]")
model=$(cat ${ufs_dev}/model | tr -d "[:space:]")
rev=$(cat ${ufs_dev}/rev | tr -d "[:space:]")
file=$(find ${fw_dir} -name "*${vendor}${model}${rev}*" | head -n 1)
if [ -n "$file" ]; then
# The first 4KB block at fips partition has been occupied, and unused space begins from 4 KB
# Refer to: go/pixel-mp-ffu-ota-1p
dd if="$file" of=$blk_dev bs=4k seek=1
fi