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

Commit c34bb73c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[DO NOT MERGE] Fix SHAs in IRadio 1.5 am: 755bf306 am: 193716ee 

Change-Id: Ia07b60fc539a2e1bd2d723b68fc5a1d7baf4ddae
parents c5ef701a 193716ee

current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -634,8 +634,8 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 
619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback

619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback

c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork

c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork

9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types

9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types

17f92261051ee7f08662a9d09a4a7af629551194018ff65855b3740fa22b6094 android.hardware.radio@1.5::types

d9044563a5ac5a17a239303b8dec1e51167761ac46e965f61e31654cc034d31b android.hardware.radio@1.5::types

5ae0401fdaad9b85de7bebc5bdd7388a4ea661c46f1e4929341981b0540c67de android.hardware.radio@1.5::IRadio

afa2d6cf4c0ba4b8482d5bcc097594ad5bc49be0bf3003034f75955cdaf66045 android.hardware.radio@1.5::IRadio

bc59237dbd93949238081f762710552e76670cb648c0e198138551460ac54b1e android.hardware.radio@1.5::IRadioIndication

bc59237dbd93949238081f762710552e76670cb648c0e198138551460ac54b1e android.hardware.radio@1.5::IRadioIndication

f4888f9676890b43a459c6380f335fea7a6ad32ed3bafafeb018a88d6c0be8a4 android.hardware.radio@1.5::IRadioResponse

f4888f9676890b43a459c6380f335fea7a6ad32ed3bafafeb018a88d6c0be8a4 android.hardware.radio@1.5::IRadioResponse

55f0a15642869ec98a55ea0a5ac049d3e1a6245ff7750deb6bcb7182057eee83 android.hardware.radio.config@1.3::types

55f0a15642869ec98a55ea0a5ac049d3e1a6245ff7750deb6bcb7182057eee83 android.hardware.radio.config@1.3::types

radio/1.5/IRadio.hal

+4 −4
Original line number Original line Diff line number Diff line
@@ -151,8 +151,8 @@ interface IRadio extends @1.4::IRadio { 
     * @param reason The request reason. Must be DataRequestReason.NORMAL or

     * @param reason The request reason. Must be DataRequestReason.NORMAL or

     *     DataRequestReason.HANDOVER.

     *     DataRequestReason.HANDOVER.

     * @param addresses If the reason is DataRequestReason.HANDOVER, this indicates the list of link

     * @param addresses If the reason is DataRequestReason.HANDOVER, this indicates the list of link

     *     addresses of the existing data connection. This parameter must be ignored

     *     addresses of the existing data connection. This parameter must be ignored unless reason

     *     unless reason is DataRequestReason.HANDOVER.

     *     is DataRequestReason.HANDOVER.

     * @param dnses If the reason is DataRequestReason.HANDOVER, this indicates the list of DNS

     * @param dnses If the reason is DataRequestReason.HANDOVER, this indicates the list of DNS

     *     addresses of the existing data connection. The format is defined in RFC-4291 section

     *     addresses of the existing data connection. The format is defined in RFC-4291 section

     *     2.2. For example, "192.0.1.3" or "2001:db8::1". This parameter must be ignored unless

     *     2.2. For example, "192.0.1.3" or "2001:db8::1". This parameter must be ignored unless
@@ -161,7 +161,7 @@ interface IRadio extends @1.4::IRadio { 
     * Response function is IRadioResponse.setupDataCallResponse_1_5()

     * Response function is IRadioResponse.setupDataCallResponse_1_5()

     *

     *

     * Note this API is the same as the 1.4 version except using the

     * Note this API is the same as the 1.4 version except using the

     * 1.5 AccessNetwork and DataProfileInto as the input param.

     * 1.5 AccessNetwork, DataProfileInto, and link addresses as the input param.

     */

     */

    oneway setupDataCall_1_5(int32_t serial, AccessNetwork accessNetwork,

    oneway setupDataCall_1_5(int32_t serial, AccessNetwork accessNetwork,

            DataProfileInfo dataProfileInfo, bool roamingAllowed,

            DataProfileInfo dataProfileInfo, bool roamingAllowed,
@@ -189,7 +189,7 @@ interface IRadio extends @1.4::IRadio { 
     * Response callback is IRadioResponse.setDataProfileResponse_1_5()

     * Response callback is IRadioResponse.setDataProfileResponse_1_5()

     *

     *

     * Note this API is the same as the 1.4 version except using the 1.5 DataProfileInfo

     * Note this API is the same as the 1.4 version except using the 1.5 DataProfileInfo

     * and LinkAddress as the input param.

     * as the input param.

     */

     */

    oneway setDataProfile_1_5(int32_t serial, vec<DataProfileInfo> profiles);

    oneway setDataProfile_1_5(int32_t serial, vec<DataProfileInfo> profiles);

radio/1.5/types.hal

+4 −1
Original line number Original line Diff line number Diff line
@@ -312,6 +312,9 @@ enum AddressProperty : int32_t { 
    DEPRECATED = 0x20,

    DEPRECATED = 0x20,

};

};





/**

 * Describes a data link address for mobile data connection.

 */

struct LinkAddress {

struct LinkAddress {

    /**

    /**

     * The format is IP address with optional "/"

     * The format is IP address with optional "/"
@@ -342,7 +345,7 @@ struct LinkAddress { 




/**

/**

 * Overwritten from @1.4::SetupDataCallResult in order to update the addresses to 1.5

 * Overwritten from @1.4::SetupDataCallResult in order to update the addresses to 1.5

 * version.

 * version. In 1.5 the type of addresses changes to vector of LinkAddress.

 */

 */

struct SetupDataCallResult {

struct SetupDataCallResult {

    /** Data call fail cause. DataCallFailCause.NONE if no error. */

    /** Data call fail cause. DataCallFailCause.NONE if no error. */