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

Commit a26bed9c authored by Michele Berionne's avatar Michele Berionne Committed by android-build-merger
Browse files

Merge "Fix documentation for carrier lock APIs in IRadio 1.4" am: caec5406 

am: 8987bebd

Change-Id: Id6f59584244d4bd389a7e0ba9247376d430ed4c3
parents b07fc894 8987bebd

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ a1c6b0761bcb89d6bf15a156f9306b8090b3a916a15fea1689b4b0c1738e382f android.hardwar 
e9d0f11a52715f5a29d89e2d8e2e21db1e16a43174af6b9d51a62d705cda1455 android.hardware.radio@1.3::IRadioIndication

d233f0da44f55fdef0a95db5229231412787bb67695cd1ea197ce89a3c2908b9 android.hardware.radio@1.3::IRadioResponse

750a363c8cec70baa1aac19e275c15233c5898e93c6bb5155fa2ca7f365490dc android.hardware.radio@1.3::types

4ac73ec1e4cfa535209e5e22547f08beb20ef812b4a29d0824780f52cbe2324d android.hardware.radio@1.4::IRadio

ef4ab741f7e7762fb45e2e24ca83871f72006ce05f57aa9addc574893dd29872 android.hardware.radio@1.4::IRadio

33d9e6895cca98aa56296bb01720d18b8acd0e4de4960beb712e63ad147438a5 android.hardware.radio@1.4::IRadioIndication

0cc0dd87c634aad36d7df22b2832839ef7ded71909dbcde11cfdd69dc0dc52b8 android.hardware.radio@1.4::IRadioResponse

22091ad1f6cb6da1c7c1467e6412c9c1ae577b3ecc0c3e5047fc4b50cdd60c69 android.hardware.radio@1.4::types

radio/1.4/IRadio.hal

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ interface IRadio extends @1.3::IRadio { 
     *        as defined in types.hal

     * @param multiSimPolicy Policy to be used for devices with multiple SIMs.

     *

     * Response callback is IRadioResponse.setAllowedCarriersResponse()

     * Response callback is IRadioResponse.setAllowedCarriersResponse_1_4()

     */

    oneway setAllowedCarriers_1_4(int32_t serial, CarrierRestrictionsWithPriority carriers,

            SimLockMultiSimPolicy multiSimPolicy);
@@ -217,7 +217,7 @@ interface IRadio extends @1.3::IRadio { 
     *

     * @param serial Serial number of request.

     *

     * Response callback is IRadioResponse.getAllowedCarriersResponse_1_3()

     * Response callback is IRadioResponse.getAllowedCarriersResponse_1_4()

     */

    oneway getAllowedCarriers_1_4(int32_t serial);