diff --git a/OWNERS b/OWNERS
index 0914422..c7a36d1 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
per-file perf/*,thermal/*= 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:main:/OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS
diff --git a/audio/tegu/aidl_config/audio_platform_configuration.xml b/audio/tegu/aidl_config/audio_platform_configuration.xml
index 2e47f46..5641474 100644
--- a/audio/tegu/aidl_config/audio_platform_configuration.xml
+++ b/audio/tegu/aidl_config/audio_platform_configuration.xml
@@ -27,7 +27,9 @@
-
+
+
+
diff --git a/audio/tegu/aidl_config/mixer_paths_aidl.xml b/audio/tegu/aidl_config/mixer_paths_aidl.xml
index 29b85ee..c6c45f8 100644
--- a/audio/tegu/aidl_config/mixer_paths_aidl.xml
+++ b/audio/tegu/aidl_config/mixer_paths_aidl.xml
@@ -1223,7 +1223,7 @@
-
+
diff --git a/audio/tegu/config/mixer_paths_aidl.xml b/audio/tegu/config/mixer_paths_aidl.xml
deleted file mode 100644
index c6c45f8..0000000
--- a/audio/tegu/config/mixer_paths_aidl.xml
+++ /dev/null
@@ -1,1409 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/device-tegu.mk b/device-tegu.mk
index 5ef1bb7..79a4c67 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -272,6 +272,14 @@ 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
+
# Display LBE
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
diff --git a/perf/powerhint-tegu.json b/perf/powerhint-tegu.json
index ec210a4..669b81f 100644
--- a/perf/powerhint-tegu.json
+++ b/perf/powerhint-tegu.json
@@ -2039,7 +2039,7 @@
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
- "Value": "1280 1100 1055"
+ "Value": "1100"
},
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2207,7 +2207,7 @@
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CDPreferHighCap",
"Duration": 0,
- "Value": "1"
+ "Value": "0"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -2297,13 +2297,13 @@
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUDVFSHeadroom",
"Duration": 0,
- "Value": "1100"
+ "Value": "1280 1100 1055"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUUtilThreshold",
"Duration": 0,
- "Value": "1100"
+ "Value": "1100 1024 1100"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -2888,17 +2888,29 @@
"Duration": 0,
"Value": "1"
},
+ {
+ "PowerHint": "CAMERA_PROJECT11",
+ "Node": "PMU_LIT_LIMIT_FREQ",
+ "Duration": 0,
+ "Value": "1098000"
+ },
{
"PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_LIT_SPC_THRESHOLD",
"Duration": 0,
- "Value": "0"
+ "Value": "55"
+ },
+ {
+ "PowerHint": "CAMERA_PROJECT11",
+ "Node": "PMU_MID_LIMIT_FREQ",
+ "Duration": 0,
+ "Value": "1328000"
},
{
"PowerHint": "CAMERA_PROJECT11",
"Node": "PMU_MID_SPC_THRESHOLD",
"Duration": 0,
- "Value": "50"
+ "Value": "30"
},
{
"PowerHint": "CAMERA_PROJECT11",
@@ -2910,29 +2922,41 @@
"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"
- },
- {
- "PowerHint": "CAMERA_PROJECT11",
- "Node": "CDPreferHighCap",
+ "Node": "PMU_FORCE_LIMIT",
"Duration": 0,
"Value": "1"
},
{
"PowerHint": "CAMERA_PROJECT11",
- "Node": "CDPreferIdle",
+ "Node": "EM_Profile",
+ "Duration": 0,
+ "Value": "cam2"
+ },
+ {
+ "PowerHint": "CAMERA_PROJECT11",
+ "Node": "CPUUtilThreshold",
+ "Duration": 0,
+ "Value": "1100 1024 1100"
+ },
+ {
+ "PowerHint": "CAMERA_PROJECT11",
+ "Node": "CPUDVFSHeadroom",
+ "Duration": 0,
+ "Value": "1100"
+ },
+ {
+ "PowerHint": "CAMERA_PROJECT11",
+ "Node": "CDPreferHighCap",
"Duration": 0,
"Value": "0"
},
@@ -2940,25 +2964,13 @@
"PowerHint": "CAMERA_PROJECT11",
"Node": "TAPreferHighCap",
"Duration": 0,
- "Value": "1"
+ "Value": "0"
},
{
"PowerHint": "CAMERA_PROJECT11",
- "Node": "CPUBigClusterMaxFreq",
+ "Node": "TAPreferIdle",
"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",
@@ -2988,7 +3000,25 @@
"PowerHint": "CAMERA_PROJECT11",
"Node": "CDCpuset",
"Duration": 0,
- "Value": "0-7"
+ "Value": "0-6"
+ },
+ {
+ "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": "CPUSkipMask",
+ "Duration": 0,
+ "Value": "0x80"
},
{
"PowerHint": "CAMERA_PROJECT11",
diff --git a/tegu/overlay/frameworks/base/core/res/res/values/config.xml b/tegu/overlay/frameworks/base/core/res/res/values/config.xml
index ed0b9e1..cf7de6f 100644
--- a/tegu/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tegu/overlay/frameworks/base/core/res/res/values/config.xml
@@ -207,4 +207,10 @@
com.google.sensor.long_press
+
+
+ false
+
+ com.google.android.gms