Merge Android 12 QPR 3

Bug: 236045730
Merged-In: I42565f0acc744669c6c335543a6f1470ad326d4e
Change-Id: I6bdaaa95e15701057feb53924cf74f5d5a28b651

conf/init.gs101.rc

@@ -523,6 +523,7 @@ on fs
     restorecon_recursive /mnt/vendor/persist/audio
     restorecon_recursive /mnt/vendor/persist/sensors
     restorecon_recursive /mnt/vendor/persist/battery
+    restorecon_recursive /mnt/vendor/persist/modem
     # Set up display-related directories and permissions
     # Add restorecon_recursive command to make sure the restorecon label is persist_display_file.
     restorecon_recursive /mnt/vendor/persist/display
@@ -855,6 +856,11 @@ on post-fs-data
 
 on property:vendor.thermal.link_ready=1
     # BCL
+    write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0xfff041c5
+    write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_light_clk_ratio 0xfff041c5
+    write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385
+    write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c3
+    write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c3
     write /dev/thermal/tz-by-name/smpl_gm/policy user_space
     write /dev/thermal/tz-by-name/vdroop1/policy user_space
     write /dev/thermal/tz-by-name/vdroop2/policy user_space

device.mk

@@ -964,7 +964,8 @@ PRODUCT_PACKAGES += \
 	audio.r_submix.default \
 	libamcsextfile \
 	audio_amcs_ext \
-
+	libspatialaudio \
+	librondo
 
 #Audio Vendor libraries
 PRODUCT_PACKAGES += \
@@ -997,6 +998,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	ro.audio.monitorRotation = true \
 	ro.audio.offload_wakelock=false
 
+# declare use of spatial audio
+# PRODUCT_PROPERTY_OVERRIDES += \
+#	ro.audio.spatializer_enabled=true
+
 ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 # IAudioMetricExt HIDL
 PRODUCT_PACKAGES += \

dumpstate/DumpstateDevice.cpp

@@ -488,6 +488,10 @@ void DumpstateDevice::dumpThermalSection(int fd) {
                    "for f in /sys/class/thermal/cooling* ; do "
                        "type=`cat $f/type` ; temp=`cat $f/cur_state` ; echo \"$type: $temp\" ; "
                        "done"});
+    RunCommandToFd(fd, "Cooling Device Time in State", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; "
+                   "do type=`cat $f/type` ; temp=`cat $f/stats/time_in_state_ms` ; echo \"$type:\n$temp\" ; done"});
+    RunCommandToFd(fd, "Cooling Device Trans Table", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; "
+                   "do type=`cat $f/type` ; temp=`cat $f/stats/trans_table` ; echo \"$type:\n$temp\" ; done"});
     RunCommandToFd(fd, "Cooling Device State2Power Table", {"/vendor/bin/sh", "-c",
                    "for f in /sys/class/thermal/cooling* ; do "
                        "type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; "

fingerprint/extension/Android.bp

@@ -0,0 +1,15 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_google_gs101_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["device_google_gs101_license"],
+}
+
+sh_binary {
+    name: "fingerprint.extension.sh",
+    init_rc: ["init.fingerprint.extension.rc"],
+    src: "fingerprint.extension.sh",
+    system_ext_specific: true,
+}

fingerprint/extension/fingerprint.extension.mk

@@ -0,0 +1,11 @@
+# Fingerprint extension feature
+ifneq (,$(filter userdebug, $(TARGET_BUILD_VARIANT)))
+SOONG_CONFIG_fp_hal_feature += report_bug_support
+SOONG_CONFIG_fp_hal_feature_report_bug_support := true
+BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/vendor/
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/public/
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/private/
+PRODUCT_PACKAGES += \
+    fps_ext_bug_lib \
+    fingerprint.extension.sh
+endif

fingerprint/extension/fingerprint.extension.sh

@@ -0,0 +1,63 @@
+#!/system/bin/sh
+
+# BetterBug required fields
+am='am start -a com.google.android.apps.betterbug.intent.FILE_BUG_DEEPLINK --ez EXTRA_DEEPLINK true '
+issueTitle=' --es EXTRA_ISSUE_TITLE '
+additionalComment=' --es EXTRA_ADDITIONAL_COMMENT '
+componentId=' --el EXTRA_COMPONENT_ID '
+requireBugReport=' --ez EXTRA_REQUIRE_BUGREPORT '
+bugAssign=' --es EXTRA_BUG_ASSIGNEE '
+ccGroup=' --es EXTRA_CC '
+
+# BetterBug title
+kAuthTitle="UDFPS Fingerprint authentication has high failed rate"
+kLockoutTitle="UDFPS Fingerprint has too many lockout counts"
+kLatencyTitle="UDFPS Fingerprint took long to unlock device"
+
+# BetterBug context comment
+kAuthComment="This bug is auto created by fingerprint HAL to track fingerprint authentication"
+kLockoutComment="This bug is auto created by fingerprint HAL to track fingerprint lockout"
+kLatencyComment="This bug is auto created by fingerprint HAL to track fingerprint latency"
+
+# BetterBug assign & CC owner
+kBugAssign='udfps_data_study@google.com'
+kCcGroup='eddielan@google.com'
+kComponentId='817555'
+
+# Command to send intent to BetterBug
+commonCommand="$componentId ${kComponentId//\ /\\ }
+               $requireBugReport true
+               $bugAssign ${kBugAssign//\ /\\ }
+               $ccGroup ${kCcGroup//\ /\\ }"
+authCommand="$am $issueTitle ${kAuthTitle//\ /\\ }
+             $additionalComment ${kAuthComment//\ /\\ }"
+lockoutCommand="$am $issueTitle ${kLockoutTitle//\ /\\ }
+                $additionalComment ${kLockoutComment//\ /\\ }"
+latencyCommand="$am $issueTitle ${kLatencyTitle//\ /\\ }
+                $additionalComment ${kLatencyComment//\ /\\ }"
+
+# Type of bug being triggered
+# 1. Latency
+# 2. Lockout
+# 3. Finerprint authentication(FRR)
+bug_type="$1"
+
+send=1
+if [ "$bug_type" == "latency" ]; then
+  intentCommand="$latencyCommand $commonCommand"
+elif [ "$bug_type" == "lockout" ]; then
+  intentCommand="$lockoutCommand $commonCommand"
+elif [ "$bug_type" == "auth" ]; then
+  intentCommand="$authCommand $commonCommand"
+else
+  send=0
+  echo "Unknown bug_type $bug_type"
+fi
+
+if [ $send -eq 1 ]
+then
+  eval $intentCommand
+fi
+
+# Exit
+exit 0

fingerprint/extension/init.fingerprint.extension.rc

@@ -0,0 +1,19 @@
+# init-fingerprint-extension-sh is to send intent command to app
+# for tracking fingerprint issue.
+service fingerprint-extension-bug-latency /system_ext/bin/fingerprint.extension.sh latency
+    group shell
+    user shell
+    disabled
+    oneshot
+
+service fingerprint-extension-bug-lockout /system_ext/bin/fingerprint.extension.sh lockout
+    group shell
+    user shell
+    disabled
+    oneshot
+
+service fingerprint-extension-bug-auth /system_ext/bin/fingerprint.extension.sh auth
+    group shell
+    user shell
+    disabled
+    oneshot

media_codecs_aosp_c2.xml

@@ -115,7 +115,7 @@
             <Limit name="size" min="64x64" max="3840x2176" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
-            <Limit name="block-count" range="1-2025" />
+            <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
             <Limit name="performance-point-1280x720" range="240" />
@@ -128,7 +128,7 @@
             <Limit name="size" min="64x64" max="3840x2176" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
-            <Limit name="block-count" range="1-2025" />
+            <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
             <Limit name="bitrate" range="1-80000000" />
             <Limit name="performance-point-1280x720" range="240" />
@@ -158,7 +158,7 @@
             <Limit name="size" min="64x64" max="3840x2176" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="32x32" />
-            <Limit name="block-count" range="1-8100" />
+            <Limit name="block-count" range="1-8160" />
             <Limit name="blocks-per-second" min="1" max="979200" />
             <Limit name="bitrate" range="1-120000000" />
             <Limit name="performance-point-1280x720" range="240" />
@@ -209,7 +209,7 @@
             <Limit name="size" min="64x64" max="3840x2176" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="64x64" />
-            <Limit name="block-count" range="1-2025" />
+            <Limit name="block-count" range="1-2040" />
             <Limit name="blocks-per-second" min="1" max="243000" />
             <Limit name="bitrate" range="1-80000000" />
             <Limit name="performance-point-1280x720" range="240" />

overlay/frameworks/base/core/res/res/values/config.xml

@@ -100,7 +100,8 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="status_bar_height_default">28dp</dimen>
+    <dimen name="status_bar_height_portrait">28dp</dimen>
 
     <!-- Height of area above QQS where battery/time go (equal to status bar height if > 48dp) -->
     <dimen name="quick_qs_offset_height">171px</dimen>

task_profiles.json

@@ -3,14 +3,6 @@
     {
       "Name": "MaxPerformance",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":
@@ -25,14 +17,6 @@
     {
       "Name": "CameraServicePerformance",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":
@@ -47,14 +31,6 @@
     {
       "Name": "CameraServicePower",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":
@@ -69,14 +45,6 @@
     {
       "Name": "Dex2oatPerformance",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":
@@ -130,14 +98,6 @@
     {
       "Name": "HighEnergySaving",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":
@@ -152,14 +112,6 @@
     {
       "Name": "NormalPerformance",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":
@@ -174,14 +126,6 @@
     {
       "Name": "HighPerformance",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":
@@ -196,14 +140,6 @@
     {
       "Name": "RealtimePerformance",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":
@@ -218,14 +154,6 @@
     {
       "Name": "NNApiHALPerformance",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":
@@ -240,14 +168,6 @@
     {
       "Name": "ServicePerformance",
       "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpu",
-            "Path": "system"
-          }
-        },
         {
           "Name": "WriteFile",
           "Params":