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

Commit 2cb3eb00 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8604704 from 065fb0f5 to tm-release 

Change-Id: I0009189cf05fcaddd628cd9cd74a42366f3efb5d
parents 1593b6f7 065fb0f5

services/audiopolicy/enginedefault/src/Engine.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -509,7 +509,7 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
            if (device != nullptr) break;

            if (device != nullptr) break;

        }

        }

        device = availableDevices.getFirstExistingDevice({

        device = availableDevices.getFirstExistingDevice({

                AUDIO_DEVICE_IN_BLE_HEADSET, AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE,

                AUDIO_DEVICE_IN_BLUETOOTH_BLE, AUDIO_DEVICE_IN_BUILTIN_MIC});

                AUDIO_DEVICE_IN_BLUETOOTH_BLE, AUDIO_DEVICE_IN_BUILTIN_MIC});

        break;

        break;
@@ -563,7 +563,7 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
        // because sometimes user want to do voice search by bt remote

        // because sometimes user want to do voice search by bt remote

        // even if BUILDIN_MIC is available.

        // even if BUILDIN_MIC is available.

        device = availableDevices.getFirstExistingDevice({

        device = availableDevices.getFirstExistingDevice({

                AUDIO_DEVICE_IN_BLE_HEADSET, AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE,

                AUDIO_DEVICE_IN_BLUETOOTH_BLE, AUDIO_DEVICE_IN_BUILTIN_MIC});

                AUDIO_DEVICE_IN_BLUETOOTH_BLE, AUDIO_DEVICE_IN_BUILTIN_MIC});
@@ -579,7 +579,7 @@ sp<DeviceDescriptor> Engine::getDeviceForInputSource(audio_source_t inputSource) 
            if (device != nullptr) break;

            if (device != nullptr) break;

        }

        }

        device = availableDevices.getFirstExistingDevice({

        device = availableDevices.getFirstExistingDevice({

                AUDIO_DEVICE_IN_BLE_HEADSET, AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_WIRED_HEADSET,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE,

                AUDIO_DEVICE_IN_USB_HEADSET, AUDIO_DEVICE_IN_USB_DEVICE,

                AUDIO_DEVICE_IN_BUILTIN_MIC});

                AUDIO_DEVICE_IN_BUILTIN_MIC});

        break;

        break;

services/camera/libcameraservice/utils/SessionConfigurationUtils.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -620,6 +620,10 @@ convertToHALStreamCombination( 
        stream.bufferSize = 0;

        stream.bufferSize = 0;

        stream.groupId = -1;

        stream.groupId = -1;

        stream.sensorPixelModesUsed = defaultSensorPixelModes;

        stream.sensorPixelModesUsed = defaultSensorPixelModes;

        using DynamicRangeProfile =

            aidl::android::hardware::camera::metadata::RequestAvailableDynamicRangeProfilesMap;

        stream.dynamicRangeProfile =

            DynamicRangeProfile::ANDROID_REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES_MAP_STANDARD;

        streamConfiguration.streams[streamIdx++] = stream;

        streamConfiguration.streams[streamIdx++] = stream;

        streamConfiguration.multiResolutionInputImage =

        streamConfiguration.multiResolutionInputImage =

                sessionConfiguration.inputIsMultiResolution();

                sessionConfiguration.inputIsMultiResolution();