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

Commit 3c95ae16 authored by Ram Periathiruvadi's avatar Ram Periathiruvadi Committed by android-build-merger
Browse files

Merge "Deprecate DRIVING_STATUS vehicle property." into pi-dev 

am: 899d09c3

Change-Id: I658ea31e4adeb8ba9cb0ae55c911a1a3eec49e00
parents fc5a117f 899d09c3

automotive/vehicle/2.0/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ hidl_interface { 
        "VehicleAreaWindow",

        "VehicleAreaZone",

        "VehicleDisplay",

        "VehicleDrivingStatus",

        "VehicleGear",

        "VehicleHvacFanDirection",

        "VehicleHwKeyInputAction",

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

+0 −8
Original line number Diff line number Diff line
@@ -344,14 +344,6 @@ const ConfigDeclaration kVehicleProperties[]{ 
         },

     .initialValue = {.int32Values = {0}}},



    {.config =

         {

             .prop = toInt(VehicleProperty::DRIVING_STATUS),

             .access = VehiclePropertyAccess::READ,

             .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

         },

     .initialValue = {.int32Values = {toInt(VehicleDrivingStatus::UNRESTRICTED)}}},



    {.config =

         {

             .prop = toInt(VehicleProperty::GEAR_SELECTION),

automotive/vehicle/2.0/types.hal

+0 −27
Original line number Diff line number Diff line
@@ -466,19 +466,6 @@ enum VehicleProperty: int32_t { 
        | VehiclePropertyType:BOOLEAN

        | VehicleArea:GLOBAL),



    /**

     * Driving status policy.

     *

     * @change_mode VehiclePropertyChangeMode:ON_CHANGE

     * @access VehiclePropertyAccess:READ

     * @data_enum VehicleDrivingStatus

     */

    DRIVING_STATUS = (

        0x0404

        | VehiclePropertyGroup:SYSTEM

        | VehiclePropertyType:INT32

        | VehicleArea:GLOBAL),



    /**

     * Warning for fuel low level.

     *
@@ -2168,20 +2155,6 @@ enum VehiclePropertyStatus : int32_t { 
    ERROR       = 0x02,

};



/**

 * Car states.

 *

 * The driving states determine what features of the UI will be accessible.

 */

enum VehicleDrivingStatus : int32_t {

    UNRESTRICTED = 0x00,

    NO_VIDEO = 0x01,

    NO_KEYBOARD_INPUT = 0x02,

    NO_VOICE_INPUT = 0x04,

    NO_CONFIG = 0x08,

    LIMIT_MESSAGE_LEN = 0x10,

};



/**

 * Various gears which can be selected by user and chosen in system.

 */

current.txt

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

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

80fb4156fa91ce86e49bd2cabe215078f6b69591d416a09e914532eae6712052 android.hardware.automotive.vehicle@2.0::IVehicleCallback

4ff0dcfb938a5df283eef47de33b4e1284fab73f584cfc0c94e97317bdb7bf26 android.hardware.automotive.vehicle@2.0::types

a7ac51f419107020b9544efb25e030485e5dc4914c5138c2b8d83a1f52a76825 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