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

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

Snap for 7026150 from 5ac252ba to sc-release

Change-Id: Id22daf5c353f7cfa3a20f92e94aaa5e220d37a20
parents 4f05b3dc 5ac252ba
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ enum AudioFocusChange {
    GAIN_TRANSIENT = 2,
    GAIN_TRANSIENT_MAY_DUCK = 3,
    GAIN_TRANSIENT_EXCLUSIVE = 4,
    LOSS = -1, // -1 * GAIN,
    LOSS_TRANSIENT = -2, // -1 * GAIN_TRANSIENT,
    LOSS_TRANSIENT_CAN_DUCK = -3, // -1 * GAIN_TRANSIENT_MAY_DUCK,
    LOSS = -1 * GAIN,
    LOSS_TRANSIENT = -1 * GAIN_TRANSIENT,
    LOSS_TRANSIENT_CAN_DUCK = -1 * GAIN_TRANSIENT_MAY_DUCK,
}
 No newline at end of file
+1 −2
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ cc_library_static {
    whole_static_libs: [
        "android.hardware.automotive.vehicle@2.0-emulated-user-hal-lib",
        "android.hardware.automotive.vehicle@2.0-manager-lib",
        "libqemu_pipe",
    ],
    shared_libs: [
        "libbase",
@@ -95,7 +96,6 @@ cc_library_static {
        "libprotobuf-cpp-lite",
    ],
    static_libs: [
        "libqemu_pipe",
        "android.hardware.automotive.vehicle@2.0-libproto-native",
    ],
}
@@ -210,6 +210,5 @@ cc_binary {
        "android.hardware.automotive.vehicle@2.0-manager-lib",
        "android.hardware.automotive.vehicle@2.0-default-impl-lib",
        "android.hardware.automotive.vehicle@2.0-libproto-native",
        "libqemu_pipe",
    ],
}
+13 −0
Original line number Diff line number Diff line
@@ -306,6 +306,19 @@ const ConfigDeclaration kVehicleProperties[]{
                 },
         .initialValue = {.int32Values = {(int)VehicleUnit::KILOMETERS_PER_HOUR}}},

        {.config =
                 {
                         .prop = toInt(VehicleProperty::SEAT_OCCUPANCY),
                         .access = VehiclePropertyAccess::READ,
                         .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
                         .areaConfigs = {VehicleAreaConfig{.areaId = (SEAT_1_LEFT)},
                                         VehicleAreaConfig{.areaId = (SEAT_1_RIGHT)}},
                 },
         .initialAreaValues = {{SEAT_1_LEFT,
                                {.int32Values = {(int)VehicleSeatOccupancyState::VACANT}}},
                               {SEAT_1_RIGHT,
                                {.int32Values = {(int)VehicleSeatOccupancyState::VACANT}}}}},

        {.config =
                 {
                         .prop = toInt(VehicleProperty::INFO_DRIVER_SEAT),
+15 −1
Original line number Diff line number Diff line
@@ -327,11 +327,25 @@ interface IRadio extends @1.5::IRadio {
     * @param serial Serial number of request.
     * @param networkTypeBitmap a 32-bit bearer bitmap of RadioAccessFamily
     *
     * Response callbask is IRadioResponse.setNetworkTypeBitmapResponse()
     * Response callback is IRadioResponse.setNetworkTypeBitmapResponse()
     */
    oneway setAllowedNetworkTypeBitmap(
            uint32_t serial, bitfield<RadioAccessFamily> networkTypeBitmap);

    /**
     * Requests bitmap representing the currently allowed network types.
     *
     * Requests the bitmap set by the corresponding method
     * setAllowedNetworkTypeBitmap, which sets a strict set of RATs for the
     * radio to use. Differs from getPreferredNetworkType and getPreferredNetworkTypeBitmap
     * in that those request *preferences*.
     *
     * @param serial Serial number of request.
     *
     * Response callback is IRadioResponse.getNetworkTypeBitmapResponse()
     */
    oneway getAllowedNetworkTypeBitmap(uint32_t serial);

    /**
     * Control data throttling at modem.
     *   - DataThrottlingAction:NO_DATA_THROTTLING should clear any existing
+18 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package android.hardware.radio@1.6;

import @1.0::SendSmsResult;
import @1.4::RadioAccessFamily;
import @1.5::IRadioResponse;
import @1.6::CellInfo;
import @1.6::RegStateResult;
@@ -309,6 +310,23 @@ interface IRadioResponse extends @1.5::IRadioResponse {
     */
    oneway setAllowedNetworkTypeBitmapResponse(RadioResponseInfo info);

    /**
     * Callback of IRadio.getAllowedNetworkTypeBitmap(int, bitfield<RadioAccessFamily>)
     *
     * Valid errors returned:
     *   RadioError:NONE
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:OPERATION_NOT_ALLOWED
     *   RadioError:MODE_NOT_SUPPORTED
     *   RadioError:INTERNAL_ERR
     *   RadioError:INVALID_ARGUMENTS
     *   RadioError:MODEM_ERR
     *   RadioError:REQUEST_NOT_SUPPORTED
     *   RadioError:NO_RESOURCES
     */
    oneway getAllowedNetworkTypeBitmapResponse(
            RadioResponseInfo info, bitfield<RadioAccessFamily> networkTypeBitmap);

    /**
     * @param info Response info struct containing response type, serial no. and error
     *
Loading