Merge changes from topic "nfc_apex_revert" into main am: 3ea3148bf7
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2817309
Change-Id: Iffae5bfd6abee081d9d4322a67225cc5efe3bc5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values-h800dp/dimens.xml b/bluejay/overlay/frameworks/base/packages/SystemUI/customization/res/values-h800dp/dimens.xml
similarity index 100%
rename from bluejay/overlay/frameworks/base/packages/SystemUI/res/values-h800dp/dimens.xml
rename to bluejay/overlay/frameworks/base/packages/SystemUI/customization/res/values-h800dp/dimens.xml
diff --git a/device-bluejay.mk b/device-bluejay.mk
index dd53985..29c86fa 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -123,7 +123,7 @@
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=46
+ ro.vendor.build.svn=49
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
@@ -246,3 +246,7 @@
# UFS: the script is used to select the corresponding firmware to run FFU.
PRODUCT_PACKAGES += ufs_firmware_update.sh
+
+# Enable DeviceAsWebcam support
+PRODUCT_VENDOR_PROPERTIES += \
+ ro.usb.uvc.enabled=true
diff --git a/gps.xml.b3 b/gps.xml.b3
index 35fbb37..6e739e7 100644
--- a/gps.xml.b3
+++ b/gps.xml.b3
@@ -61,12 +61,14 @@
ReAidingOnHotStart="false"
ReAidingIntervalSec="1200"
PpsDevice="/sys/class/pps/pps0/assert_elapsed"
+ SensorsMask="0x244"
+ MaxThreadNum="13"
/>
<gll
PpsEnable="true"
LogPriMask="LOG_INFO"
- LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1"
MultiCarrLnaMask="L1_EXT_ON"
@@ -86,6 +88,7 @@
PowerMode="3"
MinGpsWeekNumber="2216"
OnChipAccMask="50"
+ EnableB1C="false"
/>
<gll_features
diff --git a/gps_user.xml.b3 b/gps_user.xml.b3
index 73043bb..7e321e8 100644
--- a/gps_user.xml.b3
+++ b/gps_user.xml.b3
@@ -60,6 +60,8 @@
ReAidingOnHotStart="false"
ReAidingIntervalSec="1200"
PpsDevice="/sys/class/pps/pps0/assert_elapsed"
+ SensorsMask="0x244"
+ MaxThreadNum="13"
/>
<gll
@@ -85,6 +87,7 @@
PowerMode="3"
MinGpsWeekNumber="2216"
OnChipAccMask="50"
+ EnableB1C="false"
/>
<gll_features
diff --git a/powerhint.json b/powerhint.json
index 51f0df9..90063f3 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -282,6 +282,14 @@
"ResetOnInit": true
},
{
+ "Name": "NewlyIdleBalancer",
+ "Path": "/proc/vendor_sched/idle_balancer",
+ "Values": [
+ "0",
+ "1"
+ ],
+ },
+ {
"Name": "LimitFlashCurrent",
"Path": "vendor.camera.max_flash_current",
"Values": [
@@ -593,30 +601,6 @@
"Value": "LAUNCH_EXTEND"
},
{
- "PowerHint": "LAUNCH",
- "Type": "DoHint",
- "EnableProperty": "vendor.powerhal.camerarunning",
- "Value": "CDCPUSET_RESTRICTED"
- },
- {
- "PowerHint": "LAUNCH",
- "Type": "DoHint",
- "EnableProperty": "vendor.powerhal.camerarunning",
- "Value": "CDHIGHCPUSETCPUS_RESTRICTED"
- },
- {
- "PowerHint": "LAUNCH",
- "Type": "DoHint",
- "EnableProperty": "vendor.powerhal.camerarunning",
- "Value": "CDMIDCPUSETCPUS_RESTRICTED"
- },
- {
- "PowerHint": "LAUNCH",
- "Type": "DoHint",
- "EnableProperty": "vendor.powerhal.camerarunning",
- "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
- },
- {
"PowerHint": "LAUNCH_EXTEND",
"Node": "CPUBigClusterMaxFreq",
"Duration": 2000,
@@ -983,6 +967,12 @@
"Value": "0"
},
{
+ "PowerHint": "CAMERA_STREAMING_EXTREME",
+ "Node": "NewlyIdleBalancer",
+ "Duration": 0,
+ "Value": "0"
+ },
+ {
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1079,6 +1069,12 @@
"Value": "0"
},
{
+ "PowerHint": "CAMERA_STREAMING_HIGH",
+ "Node": "NewlyIdleBalancer",
+ "Duration": 0,
+ "Value": "0"
+ },
+ {
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1157,6 +1153,12 @@
"Value": "0"
},
{
+ "PowerHint": "CAMERA_STREAMING_STANDARD",
+ "Node": "NewlyIdleBalancer",
+ "Duration": 0,
+ "Value": "0"
+ },
+ {
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1241,6 +1243,12 @@
"Value": "0"
},
{
+ "PowerHint": "CAMERA_STREAMING_LOW",
+ "Node": "NewlyIdleBalancer",
+ "Duration": 0,
+ "Value": "0"
+ },
+ {
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDCPUSET_RESTRICTED"
@@ -1543,60 +1551,6 @@
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "4"
@@ -1608,162 +1562,12 @@
"Value": "0,1,2,3"
},
{
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "Dex2oatThreads",
- "Duration": 0,
- "Value": "4"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "Dex2oatCPUSet",
- "Duration": 0,
- "Value": "0,1,2,3"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "2"
},
{
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "Dex2oatCPUSet",
- "Duration": 0,
- "Value": "0,1,2,3"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "PMU_POLL",
- "Duration": 0,
- "Value": "1"
- },
- {
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 0,
@@ -1783,71 +1587,11 @@
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "BigControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "MidControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "LittleControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "G3dControlTempSet",
- "Duration": 0,
- "Value": "80000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "BigSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "MidSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "LittleSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "G3dSwitchOnTempSet",
- "Duration": 0,
- "Value": "60000"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "Dex2oatThreads",
"Duration": 0,
"Value": "1"
},
{
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "Dex2oatCPUSet",
- "Duration": 0,
- "Value": "0,1,2,3"
- },
- {
- "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
- "Node": "Dex2oatGroup",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "FACE_UNLOCK_BOOST",
"Node": "CPU_LITTLE_TSKIN_BYPASS",
"Duration": 1000,
@@ -1937,7 +1681,7 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 15.0
},
{
"Name": "REFRESH_90FPS",
@@ -1961,7 +1705,7 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 15.0
},
{
"Name": "REFRESH_60FPS",
@@ -1985,7 +1729,7 @@
"EarlyBoost_On": false,
"EarlyBoost_TimeFactor": 0.0,
"TargetTimeFactor": 1.0,
- "StaleTimeFactor": 20.0
+ "StaleTimeFactor": 15.0
},
{
"Name": "UiHighBoostWithoutPid",
