Snap for 8512216 from 310a4fbde8d4635f2c880ac2cdf1ac753328be39 to tm-frc-media-release

Change-Id: I9dc90f502397d9df122270a20ab176c39975dc39

10 files changed, 29 insertions, 77 deletions

diff --git a/audio/mixer_paths_noextcodec_snd.xml b/audio/mixer_paths_noextcodec_snd.xml
index 0dcb797..7c48914 100644
--- a/audio/mixer_paths_noextcodec_snd.xml
+++ b/audio/mixer_paths_noextcodec_snd.xml
@@ -47,6 +47,7 @@
     <ctl name="Voip Dtx Mode" value="0" />
     <ctl name="TTY Mode" value="OFF" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
+    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia2" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="0" />
@@ -58,6 +59,7 @@
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia14" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia15" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia16" value="0" />
+    <ctl name="MultiMedia2 Mixer TX_CDC_DMA_TX_3" value="0" />
     <ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />
     <ctl name="MultiMedia5 Mixer TX_CDC_DMA_TX_3" value="0" />
     <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
@@ -168,6 +170,7 @@
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="0" />
+    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="0" />
@@ -249,6 +252,7 @@
     <!-- Incall Music -->
     <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
     <ctl name="Incall_Music Audio Mixer MultiMedia9" value="0" />
+    <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="0" />
     <!-- Incall Music End -->
 
     <!-- compress-voip-call start -->
@@ -414,6 +418,16 @@
 
     <ctl name="HAC AMP EN" value="0" />
 
+    <!-- add initial value-->
+    <ctl name="HDMI Mixer MultiMedia1" value="0" />
+    <ctl name="HDMI Mixer MultiMedia4" value="0" />
+    <ctl name="HDMI Mixer MultiMedia5" value="0" />
+    <ctl name="HDMI Mixer MultiMedia8" value="0" />
+    <ctl name="HDMI Mixer MultiMedia9" value="0" />
+    <ctl name="HDMI Mixer MultiMedia10" value="0" />
+    <ctl name="HDMI Mixer MultiMedia16" value="0" />
+    <!-- add initial value end-->`
+
     <!-- These are audio route (FE to BE) specific mixer settings -->
     <path name="gsm-mode">
     </path>
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 62f6379..85f8ed0 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -685,6 +685,7 @@ Return<DumpstateStatus> DumpstateDevice::dumpstateBoard_1_1(const hidl_handle& h
     DumpFileToFd(fd, "TTF", "/dev/logbuffer_ttf");
     DumpFileToFd(fd, "TTF details", "/sys/class/power_supply/battery/ttf_details");
     DumpFileToFd(fd, "TTF stats", "/sys/class/power_supply/battery/ttf_stats");
+    DumpFileToFd(fd, "aacr_state", "/sys/class/power_supply/battery/aacr_state");
     DumpFileToFd(fd, "ipc-local-ports", "/d/msm_ipc_router/dump_local_ports");
     RunCommandToFd(fd, "TRICKLE-DEFEND Config", {"/vendor/bin/sh", "-c", " cd /sys/devices/platform/soc/soc:google,battery/power_supply/battery/; echo \"bd_trickle_enable: `cat bd_trickle_enable`\"; echo \"bd_trickle_cnt: `cat bd_trickle_cnt`\";  echo \"bd_trickle_recharge_soc: `cat bd_trickle_recharge_soc`\";  echo \"bd_trickle_dry_run: `cat bd_trickle_dry_run`\";  echo \"bd_trickle_reset_sec: `cat bd_trickle_reset_sec`\""});
     RunCommandToFd(fd, "DWELL-DEFEND Config", {"/vendor/bin/sh", "-c", " cd /sys/devices/platform/soc/soc:google,charger/; for f in `ls charge_s*` ; do echo \"$f: `cat $f`\" ; done"});
@@ -696,6 +697,7 @@ Return<DumpstateStatus> DumpstateDevice::dumpstateBoard_1_1(const hidl_handle& h
     if (!PropertiesHelper::IsUserBuild()) {
         RunCommandToFd(fd, "Google Charger", {"/vendor/bin/sh", "-c", "cd /d/google_charger/; for f in `ls pps_*` ; do echo \"$f: `cat $f`\" ; done"});
         RunCommandToFd(fd, "Google Battery", {"/vendor/bin/sh", "-c", "cd /d/google_battery/; for f in `ls ssoc_*` ; do echo \"$f: `cat $f`\" ; done"});
+        DumpFileToFd(fd, "Charging table dump", "/d/google_battery/chg_raw_profile");
     }
 
     RunCommandToFd(fd, "Battery EEPROM", {"/vendor/bin/sh", "-c", "xxd /sys/devices/platform/soc/98c000.i2c/i2c-1/1-0050/1-00500/nvmem"});
diff --git a/init.recovery.device.rc b/init.recovery.device.rc
index 474831d..7df16ec 100644
--- a/init.recovery.device.rc
+++ b/init.recovery.device.rc
@@ -9,10 +9,6 @@ on init
     # Enable thermal mitigation
     write /sys/devices/virtual/thermal/tz-by-name/backup-charge/mode enabled
 
-    # Block layer tuning: discard chunk size up to 128MB
-    # Otherwise, contiguous discards can be merged
-    write /sys/block/sda/queue/discard_max_bytes 134217728
-
 on early-init
     # Wait to make sure we do not try to talk too early to the display
     wait /sys/class/drm/card0
diff --git a/redfin/overlay/frameworks/base/core/res/res/values/config.xml b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
index a2ac121..2eb7f2c 100755
--- a/redfin/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/core/res/res/values/config.xml
@@ -237,7 +237,9 @@
     <!-- 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">136px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Not allow to switch to higher refresh rate when display brightness setting is
          equal or less than this value -->
diff --git a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 1dcedb0..934f30a 100644
--- a/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/redfin/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -91,8 +91,6 @@
 
     <string name="config_rounded_mask" translatable="false">M156,0 C76,4 58,5 31,31 5,58 4,76 0,156</string>
 
-    <bool name="config_roundedCornerMultipleRadius">true</bool>
-
     <!-- Configure 13px of extra protection around the front-facing camera -->
     <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
         M 29,77
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
index fc42116..a6db277 100644
--- a/self-extractors/google_devices/staging/Android.mk
+++ b/self-extractors/google_devices/staging/Android.mk
@@ -16,7 +16,11 @@
 
 LOCAL_PATH := $(call my-dir)
 
+$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor)
+
 ifneq ($(filter redfin,$(TARGET_DEVICE)),)
   $(call add-radio-file,bootloader.img)
+  $(call declare-license-metadata,$(LOCAL_PATH)/bootloader.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Bootloader Image",vendor)
   $(call add-radio-file,radio.img)
+  $(call declare-license-metadata,$(LOCAL_PATH)/radio.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Radio Image",vendor)
 endif
diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk
index f95e98f..d87db8e 100644
--- a/self-extractors/qcom/staging/Android.mk
+++ b/self-extractors/qcom/staging/Android.mk
@@ -1,5 +1,11 @@
 LOCAL_PATH := $(call my-dir)
 
+$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor)
+
+$(eval $(call declare-copy-files-license-metadata,vendor/qcom/redfin,:qcom,legacy_proprietary,proprietary,vendor/qcom/redfin/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,vendor/qcom/redfin,.jar,legacy_proprietary,proprietary,vendor/qcom/redfin/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,vendor/qcom/redfin,.xml,legacy_proprietary,proprietary,vendor/qcom/redfin/LICENSE,))
+
 ifneq ($(filter redfin, $(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
diff --git a/vf/framework_item_list.txt b/vf/framework_item_list.txt
deleted file mode 100644
index 81bec4b..0000000
--- a/vf/framework_item_list.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-IMAGES/product.img
-IMAGES/product.map
-IMAGES/system_ext.img
-IMAGES/system_ext.map
-IMAGES/system.img
-IMAGES/system.map
-IMAGES/system_other.img
-IMAGES/userdata.img
-IMAGES/vbmeta_system.img
-META/apexkeys.txt
-META/apkcerts.txt
-META/filesystem_config.txt
-META/postinstall_config.txt
-META/product_filesystem_config.txt
-META/root_filesystem_config.txt
-META/system_ext_filesystem_config.txt
-META/system_other_filesystem_config.txt
-META/update_engine_config.txt
-PRODUCT/*
-ROOT/*
-SYSTEM/*
-SYSTEM_EXT/*
-SYSTEM_OTHER/*
diff --git a/vf/framework_misc_info_keys.txt b/vf/framework_misc_info_keys.txt
deleted file mode 100644
index 0bcc385..0000000
--- a/vf/framework_misc_info_keys.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-ab_update
-avb_product_add_hashtree_footer_args
-avb_product_hashtree_enable
-avb_system_add_hashtree_footer_args
-avb_system_ext_add_hashtree_footer_args
-avb_system_ext_hashtree_enable
-avb_system_hashtree_enable
-avb_system_other_add_hashtree_footer_args
-avb_system_other_hashtree_enable
-avb_vbmeta_system
-avb_vbmeta_system_algorithm
-avb_vbmeta_system_args
-avb_vbmeta_system_key_path
-avb_vbmeta_system_rollback_index_location
-building_product_image
-building_system_ext_image
-building_system_image
-building_system_other_image
-default_system_dev_certificate
-product_disable_sparse
-product_fs_type
-root_dir
-system_disable_sparse
-system_ext_disable_sparse
-system_ext_fs_type
-system_other_disable_sparse
diff --git a/vf/vendor_item_list.txt b/vf/vendor_item_list.txt
deleted file mode 100644
index a86378c..0000000
--- a/vf/vendor_item_list.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-BOOT/*
-DATA/*
-IMAGES/boot.img
-IMAGES/dtbo.img
-IMAGES/vendor_boot.img
-IMAGES/vendor.img
-IMAGES/vendor.map
-META/boot_filesystem_config.txt
-META/care_map.pb
-META/kernel_configs.txt
-META/kernel_version.txt
-META/otakeys.txt
-META/releasetools.py
-META/vendor_boot_filesystem_config.txt
-META/vendor_filesystem_config.txt
-ODM/*
-OTA/android-info.txt
-PREBUILT_IMAGES/*
-RADIO/*
-VENDOR/*
-VENDOR_BOOT/*