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

Commit 1120f618 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4807121 from a12e7b78 to pi-release 

Change-Id: I1e83ed6567ab3b3694884f35b3dfa60f85df79f9
parents 19131e0f a12e7b78

automotive/vehicle/2.0/types.hal

+3 −2
Original line number Diff line number Diff line
@@ -501,7 +501,8 @@ enum VehicleProperty : int32_t { 
    /**

     * Tire pressure

     *

     * The min/max range is used to indicate the recommended tire pressure.

     * min/max value indicates tire pressure sensor range.  Each tire will have a separate min/max

     * value denoted by its areaConfig.areaId.

     *

     * @change_mode VehiclePropertyChangeMode:CONTINUOUS

     * @access VehiclePropertyAccess:READ
@@ -510,7 +511,7 @@ enum VehicleProperty : int32_t { 
    TIRE_PRESSURE = (

        0x0309

        | VehiclePropertyGroup:SYSTEM

        | VehiclePropertyType:MIXED

        | VehiclePropertyType:FLOAT

        | VehicleArea:WHEEL),



    /**

camera/device/3.2/default/CameraDeviceSession.cpp

+21 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <android/log.h>



#include <set>

#include <cutils/properties.h>

#include <utils/Trace.h>

#include <hardware/gralloc.h>

#include <hardware/gralloc1.h>
@@ -31,9 +32,9 @@ namespace V3_2 { 
namespace implementation {



// Size of request metadata fast message queue. Change to 0 to always use hwbinder buffer.

static constexpr size_t CAMERA_REQUEST_METADATA_QUEUE_SIZE = 1 << 20 /* 1MB */;

static constexpr int32_t CAMERA_REQUEST_METADATA_QUEUE_SIZE = 1 << 20 /* 1MB */;

// Size of result metadata fast message queue. Change to 0 to always use hwbinder buffer.

static constexpr size_t CAMERA_RESULT_METADATA_QUEUE_SIZE  = 1 << 20 /* 1MB */;

static constexpr int32_t CAMERA_RESULT_METADATA_QUEUE_SIZE  = 1 << 20 /* 1MB */;



// Metadata sent by HAL will be replaced by a compact copy

// if their (total size >= compact size + METADATA_SHRINK_ABS_THRESHOLD &&
@@ -95,14 +96,30 @@ bool CameraDeviceSession::initialize() { 
        return true;

    }



    int32_t reqFMQSize = property_get_int32("ro.camera.req.fmq.size", /*default*/-1);

    if (reqFMQSize < 0) {

        reqFMQSize = CAMERA_REQUEST_METADATA_QUEUE_SIZE;

    } else {

        ALOGV("%s: request FMQ size overridden to %d", __FUNCTION__, reqFMQSize);

    }



    mRequestMetadataQueue = std::make_unique<RequestMetadataQueue>(

            CAMERA_REQUEST_METADATA_QUEUE_SIZE, false /* non blocking */);

            static_cast<size_t>(reqFMQSize),

            false /* non blocking */);

    if (!mRequestMetadataQueue->isValid()) {

        ALOGE("%s: invalid request fmq", __FUNCTION__);

        return true;

    }



    int32_t resFMQSize = property_get_int32("ro.camera.res.fmq.size", /*default*/-1);

    if (resFMQSize < 0) {

        resFMQSize = CAMERA_RESULT_METADATA_QUEUE_SIZE;

    } else {

        ALOGV("%s: result FMQ size overridden to %d", __FUNCTION__, resFMQSize);

    }

    mResultMetadataQueue = std::make_shared<RequestMetadataQueue>(

            CAMERA_RESULT_METADATA_QUEUE_SIZE, false /* non blocking */);

            static_cast<size_t>(resFMQSize),

            false /* non blocking */);

    if (!mResultMetadataQueue->isValid()) {

        ALOGE("%s: invalid result fmq", __FUNCTION__);

        return true;

confirmationui/1.0/default/service.cpp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ using android::hardware::joinRpcThreadpool; 
using android::hardware::confirmationui::V1_0::implementation::ConfirmationUI;



int main() {

    ::android::hardware::configureRpcThreadpool(1, true /*willJoinThreadpool*/);

    auto confirmationui = new ConfirmationUI();

    auto status = confirmationui->registerAsService();

    if (status != android::OK) {

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar 
3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types

b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle

7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback

3562503f550f70eec7a688343a600fb92b74efb807a31452b70195dfab328b22 android.hardware.automotive.vehicle@2.0::types

06fa7218fb1500acca69b265a7e697b885933f7146cd6e8d83fe6c1fa06ce876 android.hardware.automotive.vehicle@2.0::types

32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost

ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload

27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types

keymaster/4.0/default/service.cpp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
using android::hardware::keymaster::V4_0::SecurityLevel;



int main() {

    ::android::hardware::configureRpcThreadpool(1, true /* willJoinThreadpool */);

    auto keymaster = ::keymaster::V4_0::ng::CreateKeymasterDevice(SecurityLevel::SOFTWARE);

    auto status = keymaster->registerAsService();

    if (status != android::OK) {