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

Commit 05da4c03 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add more info on control key param" into rvc-dev am: c0e9ca79 

Change-Id: Ic31890f442ab8f0572fbf505f573f5160a749503
parents dfecdb53 c0e9ca79

current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -703,7 +703,7 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 
77531c8d048f8f8ae532babd0ca86332a865ec9aace1b051226ef2b21123e645 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork

77531c8d048f8f8ae532babd0ca86332a865ec9aace1b051226ef2b21123e645 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork

98592d193a717066facf91428426e5abe211e3bd718bc372e29fb944ddbe6e7c android.hardware.wifi.supplicant@1.3::types

98592d193a717066facf91428426e5abe211e3bd718bc372e29fb944ddbe6e7c android.hardware.wifi.supplicant@1.3::types

99f5c26b952271d1246c957e1d0271fa39445ee65cc93aa7c187834f98914a33 android.hardware.radio@1.5::types

99f5c26b952271d1246c957e1d0271fa39445ee65cc93aa7c187834f98914a33 android.hardware.radio@1.5::types

890ecacaaa6660802bac01bbbe5f16b1eb1d6a3a3f0e5b398be5cec76a5ab673 android.hardware.radio@1.5::IRadio

b454df853441c12f6e425e8a60dd29fda20f5e6e39b93d1103e4b37495db38aa android.hardware.radio@1.5::IRadio

e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication

e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication

829d3827eeb5a8f563e80fe627419b3231012fc02bc2e79782ec5e9ad9f799a4 android.hardware.radio@1.5::IRadioResponse

829d3827eeb5a8f563e80fe627419b3231012fc02bc2e79782ec5e9ad9f799a4 android.hardware.radio@1.5::IRadioResponse

3ca6616381080bdd6c08141ad12775a94ae868c58b02b1274ae3326f7de724ab android.hardware.sensors@2.1::ISensors

3ca6616381080bdd6c08141ad12775a94ae868c58b02b1274ae3326f7de724ab android.hardware.sensors@2.1::ISensors

radio/1.5/IRadio.hal

+6 −2
Original line number Original line Diff line number Diff line
@@ -325,11 +325,15 @@ interface IRadio extends @1.4::IRadio { 
    oneway sendCdmaSmsExpectMore(int32_t serial, CdmaSmsMessage sms);

    oneway sendCdmaSmsExpectMore(int32_t serial, CdmaSmsMessage sms);





    /**

    /**

     * Requests that deactivates one category of the device personalization.

     * Request that deactivates one category of device personalization. Device personalization

     * generally binds the device so it can only be used on one carrier or even one carrier subnet

     * (See TS 22.022). When the user has gained the rights to unbind the device (at the end of a

     * contract period or other event), the controlKey will be delivered to either the user for

     * manual entry or to a carrier app on the device for automatic entry.

     *

     *

     * @param serial Serial number of request.

     * @param serial Serial number of request.

     * @param persoType SIM personalization type.

     * @param persoType SIM personalization type.

     * @param controlKey depersonalization code corresponding to persoType

     * @param controlKey the unlock code for removing persoType personalization from this device

     *

     *

     * Response function is IRadioResponse.supplySimDepersonalizationResponse()

     * Response function is IRadioResponse.supplySimDepersonalizationResponse()

     */

     */