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

Commit 6675a0e5 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Update language to comply with Android's inclusive language guidance am: e442f7f4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12266138

Change-Id: Ifc414dc69ecbed284872bf9d6bdc98c052c97deb
parents 02d6f323 e442f7f4

current.txt

+1 −0
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ a64467bae843569f0d465c5be7f0c7a5b987985b55a3ef4794dd5afc68538650 android.hardwar 
cd84ab19c590e0e73dd2307b591a3093ee18147ef95e6d5418644463a6620076 android.hardware.neuralnetworks@1.2::IDevice

9625e85f56515ad2cf87b6a1847906db669f746ea4ab02cd3d4ca25abc9b0109 android.hardware.neuralnetworks@1.2::types

9e758e208d14f7256e0885d6d8ad0b61121b21d8c313864f981727ae55bffd16 android.hardware.neuralnetworks@1.3::types

7da2707d4cf93818eaf8038eb65e2180116a399c310e594a00935c5c981aa340 android.hardware.radio@1.0::types



# HALs released in Android S

# NOTE: waiting to freeze HALs until later in the release

radio/1.0/types.hal

+2 −2
Original line number Diff line number Diff line
@@ -1890,8 +1890,8 @@ struct Carrier { 
};



struct CarrierRestrictions {

    vec<Carrier> allowedCarriers;         // whitelist for allowed carriers

    vec<Carrier> excludedCarriers;        // blacklist for explicitly excluded carriers

    vec<Carrier> allowedCarriers;         // Allowed carriers

    vec<Carrier> excludedCarriers;        // Explicitly excluded carriers

                                          // which match allowed_carriers. Eg. allowedCarriers

                                          // match mcc/mnc, excludedCarriers has same mcc/mnc and

                                          // gid1 is ABCD. It means except the carrier whose gid1

radio/1.2/default/Radio.cpp

+6 −6
Original line number Diff line number Diff line
@@ -52,16 +52,16 @@ Return<void> Radio::getIccCardStatus(int32_t serial) { 
    /**

     * IRadio-defined request is called from the client and talk to the radio to get

     * IRadioResponse-defined response or/and IRadioIndication-defined indication back to the

     * client. This dummy implementation omits and replaces the design and implementation of vendor

     * client. This implementation omits and replaces the design and implementation of vendor

     * codes that needs to handle the receipt of the request and the return of the response from the

     * radio; this just directly returns a dummy response back to the client.

     * radio; this just directly returns a fake response back to the client.

     */



    ALOGD("Radio Request: getIccCardStatus is entering");



    if (mRadioResponse != nullptr || mRadioResponseV1_1 != nullptr ||

        mRadioResponseV1_2 != nullptr) {

        // Dummy RadioResponseInfo as part of response to return in 1.0, 1.1 and 1.2

        // Fake RadioResponseInfo as part of response to return in 1.0, 1.1 and 1.2

        ::android::hardware::radio::V1_0::RadioResponseInfo info;

        info.serial = serial;

        info.type = ::android::hardware::radio::V1_0::RadioResponseType::SOLICITED;
@@ -72,7 +72,7 @@ Return<void> Radio::getIccCardStatus(int32_t serial) { 
         * return getIccCardStatusResponse.

         */

        if (mRadioResponseV1_2 != nullptr) {

            // Dummy CardStatus as part of getIccCardStatusResponse_1_2 response to return

            // Fake CardStatus as part of getIccCardStatusResponse_1_2 response to return

            ::android::hardware::radio::V1_2::CardStatus card_status;

            card_status.base.cardState = ::android::hardware::radio::V1_0::CardState::ABSENT;

            card_status.base.gsmUmtsSubscriptionAppIndex = 0;
@@ -80,7 +80,7 @@ Return<void> Radio::getIccCardStatus(int32_t serial) { 
            mRadioResponseV1_2->getIccCardStatusResponse_1_2(info, card_status);

            ALOGD("Radio Response: getIccCardStatusResponse_1_2 is sent");

        } else if (mRadioResponseV1_1 != nullptr) {

            // Dummy CardStatus as part of getIccCardStatusResponse response to return

            // Fake CardStatus as part of getIccCardStatusResponse response to return

            ::android::hardware::radio::V1_0::CardStatus card_status_V1_0;

            card_status_V1_0.cardState = ::android::hardware::radio::V1_0::CardState::ABSENT;

            card_status_V1_0.gsmUmtsSubscriptionAppIndex = 0;
@@ -88,7 +88,7 @@ Return<void> Radio::getIccCardStatus(int32_t serial) { 
            mRadioResponseV1_1->getIccCardStatusResponse(info, card_status_V1_0);

            ALOGD("Radio Response: getIccCardStatusResponse is sent");

        } else {

            // Dummy CardStatus as part of getIccCardStatusResponse response to return

            // Fake CardStatus as part of getIccCardStatusResponse response to return

            ::android::hardware::radio::V1_0::CardStatus card_status_V1_0;

            card_status_V1_0.cardState = ::android::hardware::radio::V1_0::CardState::ABSENT;

            card_status_V1_0.gsmUmtsSubscriptionAppIndex = 0;

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ TEST_P(RadioHidlTest_v1_5, getBarringInfo) { 
                     info.serviceType <= BarringInfo::ServiceType::OPERATOR_32));

        reportedServices.insert(info.serviceType);



        // Any type that is "conditional" must have sane values for conditional barring

        // Any type that is "conditional" must have valid values for conditional barring

        // factor and time.

        switch (info.barringType) {

            case BarringInfo::BarringType::NONE:  // fall through
@@ -1284,7 +1284,7 @@ TEST_P(RadioHidlTest_v1_5, getBarringInfo) { 


    // Certain types of barring are relevant for certain RANs. Ensure that only the right

    // types are reported. Note that no types are required, simply that for a given technology

    // only certain types are valid. This is one way to sanity check that implementations are

    // only certain types are valid. This is one way to check that implementations are

    // not providing information that they don't have.

    static const std::set<BarringInfo::ServiceType> UTRA_SERVICES{

            BarringInfo::ServiceType::CS_SERVICE, BarringInfo::ServiceType::PS_SERVICE,