DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: I9fa27f3fe37a1739598044d29b48c3f39ebe1c98
Change-Id: Ie9e988f9f46bd4e65f7a2b27c7d346065d437642

aosp_redfin.mk

@@ -21,8 +21,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 
 # Enable mainline checking
-# TODO(b/138706293): Enable mainline checking later
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := strict
 
 #
 # All components inherited here go to system_ext image
@@ -50,6 +49,12 @@ $(call inherit-product-if-exists, vendor/google_devices/redfin/prebuilts/device-
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
 
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+  PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif
+
 # Don't build super.img.
 PRODUCT_BUILD_SUPER_PARTITION := false
 

audio/mixer_paths_noextcodec_snd.xml

@@ -563,8 +563,8 @@
     <ctl name="R VPBR Attack Volume" value="0.125dB" />
     <ctl name="VPBR Max Attenuation" value="9" />
     <ctl name="R VPBR Max Attenuation" value="9" />
-    <ctl name="VPBR Threshold 1" value="3.542" />
-    <ctl name="R VPBR Threshold 1" value="3.542" />
+    <ctl name="VPBR Threshold 1" value="2.639" />
+    <ctl name="R VPBR Threshold 1" value="2.639" />
     <!-- CS35L41 VP brownout end-->
     <!-- CS35L41 config end-->
 

bluetooth_power_limits_redfin_us.csv

@@ -7,14 +7,14 @@ Head,BTHotspot,WIFI5Ghz,HotspotVoice,BTMedia,Cell,IMU,BluetoothBDRPower,Bluetoot
 0,0,0,1,0,1,1,70,71,67
 0,0,0,1,1,0,1,70,71,67
 0,0,0,1,1,1,1,70,71,67
-0,0,1,0,0,0,1,70,71,43
-0,0,1,0,0,1,1,70,71,43
-0,0,1,0,1,0,1,70,71,43
-0,0,1,0,1,1,1,70,71,43
-0,0,1,1,0,0,1,70,71,43
-0,0,1,1,0,1,1,70,71,43
-0,0,1,1,1,0,1,70,71,43
-0,0,1,1,1,1,1,70,71,43
+0,0,1,0,0,0,1,70,71,48
+0,0,1,0,0,1,1,70,71,48
+0,0,1,0,1,0,1,70,71,48
+0,0,1,0,1,1,1,70,71,48
+0,0,1,1,0,0,1,70,71,48
+0,0,1,1,0,1,1,70,71,48
+0,0,1,1,1,0,1,70,71,48
+0,0,1,1,1,1,1,70,71,48
 0,1,0,0,0,0,1,70,71,67
 0,1,0,0,0,1,1,70,71,67
 0,1,0,0,1,0,1,70,71,67
@@ -23,14 +23,14 @@ Head,BTHotspot,WIFI5Ghz,HotspotVoice,BTMedia,Cell,IMU,BluetoothBDRPower,Bluetoot
 0,1,0,1,0,1,1,70,71,67
 0,1,0,1,1,0,1,70,71,67
 0,1,0,1,1,1,1,70,71,67
-0,1,1,0,0,0,1,70,71,43
-0,1,1,0,0,1,1,70,71,43
-0,1,1,0,1,0,1,70,71,43
-0,1,1,0,1,1,1,70,71,43
-0,1,1,1,0,0,1,70,71,43
-0,1,1,1,0,1,1,70,71,43
-0,1,1,1,1,0,1,70,71,43
-0,1,1,1,1,1,1,70,71,43
+0,1,1,0,0,0,1,70,71,48
+0,1,1,0,0,1,1,70,71,48
+0,1,1,0,1,0,1,70,71,48
+0,1,1,0,1,1,1,70,71,48
+0,1,1,1,0,0,1,70,71,48
+0,1,1,1,0,1,1,70,71,48
+0,1,1,1,1,0,1,70,71,48
+0,1,1,1,1,1,1,70,71,48
 1,0,0,0,0,0,-1,43,44,43
 1,0,0,0,0,1,-1,43,44,43
 1,0,0,0,1,0,-1,43,44,43
@@ -64,4 +64,4 @@ Head,BTHotspot,WIFI5Ghz,HotspotVoice,BTMedia,Cell,IMU,BluetoothBDRPower,Bluetoot
 1,1,1,1,1,0,-1,43,44,43
 1,1,1,1,1,1,-1,43,44,43
 0,-1,0,-1,-1,-1,0,70,71,67
-0,-1,1,-1,-1,-1,0,70,71,43
+0,-1,1,-1,-1,-1,0,70,71,48

device-redfin.mk

@@ -210,8 +210,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_f
 PRODUCT_PROPERTY_OVERRIDES += \
     vendor.display.defer_fps_frame_count=2
 
-# Keyboard height ratio
-PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.height_ratio=1.2
+# Keyboard height ratio and bottom padding in dp for portrait mode
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.com.google.ime.height_ratio=1.2 \
+    ro.com.google.ime.kb_pad_port_b=10
 
 # Bluetooth Tx power caps for redfin
 PRODUCT_COPY_FILES += \

dumpstate/DumpstateDevice.cpp

@@ -686,6 +686,7 @@ Return<DumpstateStatus> DumpstateDevice::dumpstateBoard_1_1(const hidl_handle& h
     RunCommandToFd(fd, "CPU cpuidle", {"/vendor/bin/sh", "-c", "for cpu in /sys/devices/system/cpu/cpu*; do for d in $cpu/cpuidle/state*; do if [ ! -d $d ]; then continue; fi; echo \"$d: `cat $d/name` `cat $d/desc` `cat $d/time` `cat $d/usage`\"; done; done"});
     RunCommandToFd(fd, "Airbrush debug info", {"/vendor/bin/sh", "-c", "for f in `ls /sys/devices/platform/soc/c84000.i2c/i2c-4/4-0066/@(*curr|temperature|vbat|total_power)`; do echo \"$f: `cat $f`\" ; done; file=/d/airbrush/airbrush_sm/chip_state; echo \"$file: `cat $file`\""});
     DumpFileToFd(fd, "TCPM logs", "/d/usb/tcpm-usbpd0");
+    DumpFileToFd(fd, "TCPM logs", "/dev/logbuffer_tcpm");
     DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd");
     DumpFileToFd(fd, "PPS", "/dev/logbuffer_pps");
     DumpFileToFd(fd, "BMS", "/dev/logbuffer_ssoc");
@@ -731,6 +732,9 @@ Return<DumpstateStatus> DumpstateDevice::dumpstateBoard_1_1(const hidl_handle& h
     // Dump camera profiler log
     RunCommandToFd(fd, "Camera Profiler Logs", {"/vendor/bin/sh", "-c", "for f in /data/vendor/camera/profiler/camx_*; do echo [$f]; cat \"$f\";done"});
 
+    // Dump fastrpc dma buffer size
+    DumpFileToFd(fd, "Fastrpc dma buffer", "/sys/kernel/fastrpc/total_dma_kb");
+
     if (modemThreadHandle) {
         pthread_join(modemThreadHandle, NULL);
     }

redfin/init.redfin.rc

@@ -40,6 +40,20 @@ on property:sys.retaildemo.enabled=1
 on property:sys.retaildemo.enabled=0
     write /sys/class/thermal/cdev-by-name/dc_icl/cur_state 0
 
+# Toggle glove_mode according to touch_sensitivity_mode
+on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1
+    write /sys/devices/virtual/sec/tsp/cmd "glove_mode,0"
+
+on property:persist.vendor.touch_sensitivity_mode=1 && property:sys.boot_completed=1
+    write /sys/devices/virtual/sec/tsp/cmd "glove_mode,1"
+
+# Route touch_sensitivity_mode to persist
+on property:debug.touch_sensitivity_mode=0
+    setprop persist.vendor.touch_sensitivity_mode 0
+
+on property:debug.touch_sensitivity_mode=1
+    setprop persist.vendor.touch_sensitivity_mode 1
+
 on late-init
     chown system system /sys/devices/virtual/thermal/tz-by-name/panel-audio-therm/trip_point_0_temp
     chown system system /sys/devices/virtual/thermal/tz-by-name/panel-audio-therm/trip_point_0_hyst

redfin/overlay/frameworks/base/core/res/res/xml/power_profile.xml

@@ -169,7 +169,7 @@
     <item name="gps.voltage">3700</item>
 
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">106</item>
+    <item name="wifi.controller.idle">79</item>
     <!-- Rx current for wifi radio in mA.-->
     <item name="wifi.controller.rx">118</item>
     <!-- Tx current for wifi radio in mA-->

redfin/overlay/vendor/google_devices/sunfish/proprietary/display/HbmSVManager/res/values/config.xml

@@ -21,13 +21,11 @@
   <array name="config_compensation_thresholds">
     <item>15000.0</item>
     <item>30000.0</item>
-    <item>50000.0</item>
   </array>
 
   <array name="config_compensation_images">
     <item>@drawable/r3_compensation_image_15k</item>
     <item>@drawable/r3_compensation_image_30k</item>
-    <item>@drawable/r3_compensation_image_50k</item>
   </array>
 
   <integer name="config_compensation_filter_horizon">3500</integer>

self-extractors/extract-lists.txt

@@ -7,6 +7,7 @@
     ;;
   qcom)
     TO_EXTRACT="\
+            system_ext/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml \
             system_ext/etc/permissions/org_codeaurora_ims.xml \
             system_ext/etc/permissions/qcrilhook.xml \
             system_ext/etc/permissions/telephonyservice.xml \
@@ -49,5 +50,6 @@
             system_ext/lib/libvr_object_engine.so \
             system_ext/app/QtiTelephonyService/QtiTelephonyService.apk \
             system_ext/priv-app/ims/ims.apk \
+            system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk \
             "
     ;;

self-extractors/qcom/staging/Android.mk

@@ -7,6 +7,20 @@ LOCAL_MODULE := ims
 LOCAL_MODULE_TAGS := optional
 LOCAL_BUILT_MODULE_STEM := package.apk
 LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE_OWNER := qcom
+LOCAL_MODULE_CLASS := APPS
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+LOCAL_CERTIFICATE := platform
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+LOCAL_MODULE := qcrilmsgtunnel
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_SYSTEM_EXT_MODULE := true
+LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_OWNER := qcom
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk

self-extractors/qcom/staging/device-partial.mk

@@ -18,6 +18,7 @@ PRODUCT_SOONG_NAMESPACES += \
 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
     ims \
+    qcrilmsgtunnel \
     QtiTelephonyService
 
 PRODUCT_PACKAGES += \
@@ -33,6 +34,7 @@ PRODUCT_PACKAGES += \
 
 #  blob(s) necessary for redfin hardware
 PRODUCT_COPY_FILES := \
+     vendor/qcom/redfin/proprietary/com.qualcomm.qcrilmsgtunnel.xml:system_ext/etc/permissions/com.qualcomm.qcrilmsgtunnel.xml \
      vendor/qcom/redfin/proprietary/org_codeaurora_ims.xml:system_ext/etc/permissions/org_codeaurora_ims.xml \
      vendor/qcom/redfin/proprietary/qcrilhook.xml:system_ext/etc/permissions/qcrilhook.xml \
      vendor/qcom/redfin/proprietary/telephonyservice.xml:system_ext/etc/permissions/telephonyservice.xml \

thermal_info_config_redfin.json

@@ -218,7 +218,8 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":0.001,
-            "Monitor":true
+            "Monitor":true,
+            "SendPowerHint":true
         },
         {
             "Name":"cellular-emergency",

vibrator/drv2624/Vibrator.cpp

@@ -60,7 +60,7 @@ static constexpr char WAVEFORM_HEAVY_CLICK_EFFECT_SEQ[] = "4 0";
 
 // UT team design those target G values
 static std::array<float, 5> EFFECT_TARGET_G = {0.275, 0.55, 0.6, 0.9, 1.12};
-static std::array<float, 3> STEADY_TARGET_G = {2.0, 1.145, 1.3};
+static std::array<float, 3> STEADY_TARGET_G = {2.15, 1.145, 1.3};
 
 struct SensorContext {
     ASensorEventQueue *queue;