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

Commit af56b87d authored by Sahil Sonar's avatar Sahil Sonar 💬
Browse files

Merge branch 'v1-s-vowifi' into 'v1-s' 

Upgrade to SP1A.210812.016

See merge request !10
parents 6d988b75 8db3e1a1

Android.mk

+21 −1
Original line number Original line Diff line number Diff line
@@ -10,4 +10,24 @@ ifneq ($(filter emerald zirconia,$(TARGET_DEVICE)),) 




include $(call all-makefiles-under,$(LOCAL_PATH))

include $(call all-makefiles-under,$(LOCAL_PATH))





VENDOR_SYMLINKS := \

    $(TARGET_OUT_VENDOR)/lib \

    $(TARGET_OUT_VENDOR)/lib64 \

    $(TARGET_OUT_VENDOR)/lib/hw \

    $(TARGET_OUT_VENDOR)/lib64/hw



$(VENDOR_SYMLINKS): $(LOCAL_INSTALLED_MODULE)

	$(hide) echo "Making vendor symlinks"

	@mkdir -p $(TARGET_OUT_VENDOR)/lib/hw

	@mkdir -p $(TARGET_OUT_VENDOR)/lib64/hw

	@ln -sf $(TARGET_BOARD_PLATFORM)/libdpframework.so $(TARGET_OUT_VENDOR)/lib/libdpframework.so

	@ln -sf $(TARGET_BOARD_PLATFORM)/libpq_prot.so $(TARGET_OUT_VENDOR)/lib/libpq_prot.so

	@ln -sf $(TARGET_BOARD_PLATFORM)/libmtk_drvb.so $(TARGET_OUT_VENDOR)/lib/libmtk_drvb.so

	@ln -sf $(TARGET_BOARD_PLATFORM)/libdpframework.so $(TARGET_OUT_VENDOR)/lib64/libdpframework.so

	@ln -sf $(TARGET_BOARD_PLATFORM)/libpq_prot.so $(TARGET_OUT_VENDOR)/lib64/libpq_prot.so

	@ln -sf $(TARGET_BOARD_PLATFORM)/libmtk_drvb.so $(TARGET_OUT_VENDOR)/lib64/libmtk_drvb.so

	$(hide) touch $@



ALL_DEFAULT_INSTALLED_MODULES += $(VENDOR_SYMLINKS)



endif
 
endif

BoardConfigCommon.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -97,10 +97,10 @@ TARGET_USERIMAGES_USE_EXT4 := true 
ENABLE_VENDOR_RIL_SERVICE := true

ENABLE_VENDOR_RIL_SERVICE := true





# Security patch level

# Security patch level

VENDOR_SECURITY_PATCH := 2021-10-05

VENDOR_SECURITY_PATCH := 2022-06-05





# Sepolicy

# Sepolicy

include device/mediatek/sepolicy/BoardSEPolicyConfig.mk

include device/mediatek/sepolicy_vndr/SEPolicy.mk

BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor

BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor





# Inherit the proprietary files

# Inherit the proprietary files

configs/audio/audio_policy_configuration.xml

+85 −67

File changed.

Preview size limit exceeded, changes collapsed.

configs/audio/bluetooth_audio_policy_configuration.xml→configs/audio/bluetooth_offload_audio_policy_configuration.xml

+7 −7
Original line number Original line Diff line number Diff line
@@ -7,25 +7,25 @@ 
        <!-- Hearing AIDs Audio Ports -->

        <!-- Hearing AIDs Audio Ports -->

        <mixPort name="hearing aid output" role="source">

        <mixPort name="hearing aid output" role="source">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="24000,16000"

                     samplingRates="24000 16000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

        </mixPort>

    </mixPorts>

    </mixPorts>

    <devicePorts>

    <devicePorts>

        <!-- A2DP Audio Ports -->

        <!-- A2DP Audio Ports -->

        <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">

        <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_LHDC AUDIO_FORMAT_LHDC_LL">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100,48000,88200,96000"

                     samplingRates="44100 48000 88200 96000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </devicePort>

        </devicePort>

        <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">

        <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink" encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_LHDC AUDIO_FORMAT_LHDC_LL">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100,48000,88200,96000"

                     samplingRates="44100 48000 88200 96000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </devicePort>

        </devicePort>

        <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">

        <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink" encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_LHDC AUDIO_FORMAT_LHDC_LL">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100,48000,88200,96000"

                     samplingRates="44100 48000 88200 96000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </devicePort>

        </devicePort>

        <!-- Hearing AIDs Audio Ports -->

        <!-- Hearing AIDs Audio Ports -->

configs/audio/usb_audio_policy_configuration.xml→configs/audio/usb_audio_accessory_only_policy_configuration.xml

+35 −47

File changed and moved.

Preview size limit exceeded, changes collapsed.