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

Commit 5c85e5ad authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6607158 from 45bb539c to mainline-release

Change-Id: Ieb7acd018582b334edc4e79c45110e34298c0d1a
parents d47d461e 45bb539c
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -105,6 +105,10 @@ enum EvsEventType : uint32_t {
     * Master role has become available
     */
    MASTER_RELEASED,
    /**
     * Any other erroneous streaming events
     */
    STREAM_ERROR,
};

/**
+57 −7
Original line number Diff line number Diff line
@@ -15,12 +15,10 @@
cc_defaults {
    name: "vhal_v2_0_defaults",
    shared_libs: [
        "libbinder_ndk",
        "libhidlbase",
        "liblog",
        "libutils",
        "android.hardware.automotive.vehicle@2.0",
        "carwatchdog_aidl_interface-ndk_platform",
    ],
    cflags: [
        "-Wall",
@@ -29,6 +27,15 @@ cc_defaults {
    ],
}

cc_defaults {
    name: "vhal_v2_0_target_defaults",
    defaults: ["vhal_v2_0_defaults"],
    shared_libs: [
        "libbinder_ndk",
        "carwatchdog_aidl_interface-ndk_platform",
    ],
}

cc_library_headers {
    name: "vhal_v2_0_common_headers",
    vendor: true,
@@ -39,7 +46,7 @@ cc_library_headers {
cc_library {
    name: "android.hardware.automotive.vehicle@2.0-manager-lib",
    vendor: true,
    defaults: ["vhal_v2_0_defaults"],
    defaults: ["vhal_v2_0_target_defaults"],
    srcs: [
        "common/src/Obd2SensorStore.cpp",
        "common/src/SubscriptionManager.cpp",
@@ -61,7 +68,7 @@ cc_library {
cc_library_static {
    name: "android.hardware.automotive.vehicle@2.0-default-impl-lib",
    vendor: true,
    defaults: ["vhal_v2_0_defaults"],
    defaults: ["vhal_v2_0_target_defaults"],
    srcs: [
        "impl/vhal_v2_0/CommConn.cpp",
        "impl/vhal_v2_0/EmulatedVehicleConnector.cpp",
@@ -97,16 +104,59 @@ cc_library_static {
cc_library_static {
    name: "android.hardware.automotive.vehicle@2.0-emulated-user-hal-lib",
    vendor: true,
    defaults: ["vhal_v2_0_target_defaults"],
    srcs: [
        "impl/vhal_v2_0/EmulatedUserHal.cpp",
    ],
}

// Vehicle HAL Server reference impl lib
cc_library_static {
    name: "android.hardware.automotive.vehicle@2.0-server-common-lib",
    vendor: true,
    host_supported: true,
    defaults: ["vhal_v2_0_defaults"],
    local_include_dirs: ["common/include/vhal_v2_0"],
    export_include_dirs: ["common/include"],
    srcs: [
        "common/src/Obd2SensorStore.cpp",
        "common/src/VehicleObjectPool.cpp",
        "common/src/VehicleUtils.cpp",
    ],
}

// Vehicle HAL Server default implementation
cc_library_static {
    name: "android.hardware.automotive.vehicle@2.0-server-impl-lib",
    vendor: true,
    host_supported: true,
    defaults: ["vhal_v2_0_defaults"],
    local_include_dirs: ["common/include/vhal_v2_0"],
    export_include_dirs: ["impl"],
    srcs: [
        "impl/vhal_v2_0/EmulatedUserHal.cpp",
        "impl/vhal_v2_0/GeneratorHub.cpp",
        "impl/vhal_v2_0/JsonFakeValueGenerator.cpp",
        "impl/vhal_v2_0/LinearFakeValueGenerator.cpp",
        "impl/vhal_v2_0/ProtoMessageConverter.cpp",
        "impl/vhal_v2_0/VehicleHalServer.cpp",
    ],
    whole_static_libs: [
        "android.hardware.automotive.vehicle@2.0-server-common-lib",
    ],
    static_libs: [
        "android.hardware.automotive.vehicle@2.0-libproto-native",
    ],
    shared_libs: [
        "libbase",
        "libjsoncpp",
    ],
}

cc_test {
    name: "android.hardware.automotive.vehicle@2.0-manager-unit-tests",
    vendor: true,
    defaults: ["vhal_v2_0_defaults"],
    defaults: ["vhal_v2_0_target_defaults"],
    whole_static_libs: ["android.hardware.automotive.vehicle@2.0-manager-lib"],
    srcs: [
        "tests/RecurrentTimer_test.cpp",
@@ -126,7 +176,7 @@ cc_test {
cc_test {
    name: "android.hardware.automotive.vehicle@2.0-default-impl-unit-tests",
    vendor: true,
    defaults: ["vhal_v2_0_defaults"],
    defaults: ["vhal_v2_0_target_defaults"],
    srcs: [
        "impl/vhal_v2_0/tests/ProtoMessageConverter_test.cpp",
    ],
@@ -140,7 +190,7 @@ cc_test {

cc_binary {
    name: "android.hardware.automotive.vehicle@2.0-service",
    defaults: ["vhal_v2_0_defaults"],
    defaults: ["vhal_v2_0_target_defaults"],
    vintf_fragments: [
        "android.hardware.automotive.vehicle@2.0-service.xml",
    ],
+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@
cc_library_static {
    name: "android.hardware.automotive.vehicle@2.0-libproto-native",
    vendor: true,
    host_supported: true,
    proto: {
        export_proto_headers: true,
        type: "lite",
+18 −2
Original line number Diff line number Diff line
@@ -4280,6 +4280,16 @@ enum UserFlags: int32_t {
     * Admin users have additional privileges such as permission to create other users.
     */
    ADMIN = 0x08,

    /**
     * Disabled users are marked for deletion.
     */
    DISABLED = 0x10,

     /**
     * Profile user is a profile of another user.
     */
    PROFILE = 0x20,
};

/**
@@ -4294,10 +4304,16 @@ struct UsersInfo {
    /** The current foreground user. */
    UserInfo currentUser;

    /** Number of existing users (includes the current user). */
    /**
     * Number of existing users; includes the current user, recently removed users (with DISABLED
     * flag), and profile users (with PROFILE flag).
     */
    int32_t numberUsers;

    /** List of existing users (includes the current user). */
    /**
     * List of existing users; includes the current user, recently removed users (with DISABLED
     * flag), and profile users (with PROFILE flag).
     */
    vec<UserInfo> existingUsers;
 };

+5 −2
Original line number Diff line number Diff line
@@ -87,8 +87,11 @@ interface ICameraDeviceCallback {
     * ERROR_RESULT message.
     *
     * If an output buffer cannot be filled, its status field must be set to
     * STATUS_ERROR. In addition, notify() must be called with a ERROR_BUFFER
     * message.
     * STATUS_ERROR. In this case, notify() isn't required to be called with
     * an ERROR_BUFFER message. The framework will simply treat the notify()
     * call with ERROR_BUFFER as a no-op, and derive whether and when to notify
     * the application of buffer loss based on the buffer status and whether or not
     * the entire capture has failed.
     *
     * If the entire capture has failed, then this method still needs to be
     * called to return the output buffers to the framework. All the buffer
Loading