Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10b32ad8 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android R QPR1 

Bug: 172690556
Merged-In: I9fa27f3fe37a1739598044d29b48c3f39ebe1c98
Change-Id: Ie9e988f9f46bd4e65f7a2b27c7d346065d437642
parents 80c03f8b ca24924f

aosp_redfin.mk

+7 −2
Original line number Diff line number Diff line
@@ -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/acdbdata/Handset_cal.acdb

−46 B (1.21 MiB)

File changed.

No diff preview for this file type.

View original file
View changed file

audio/acdbdata/workspaceFile.qwsp

+64 B (337 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

audio/mixer_paths_noextcodec_snd.xml

+2 −2
Original line number Diff line number Diff line
@@ -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

+17 −17
Original line number Diff line number Diff line
@@ -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
 
 No newline at end of file
 
0,-1,1,-1,-1,-1,0,70,71,48
 
 No newline at end of file