diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-29 09:51:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-29 09:51:30 +0000 |
| commit | 44ccdd3fbc849a6cd5bdfaba93be56223fa21f9c (patch) | |
| tree | 1587764edcd1945afdf79b07f3240e3e449e8f5a | |
| parent | 12c193e8f0e169c70bc25378b2cb9acf95ddfd99 (diff) | |
| parent | bec1491f5b612ba5ed5a02bf9922dab0f4eb517e (diff) | |
| download | platform_hardware_ril-44ccdd3fbc849a6cd5bdfaba93be56223fa21f9c.tar.gz platform_hardware_ril-44ccdd3fbc849a6cd5bdfaba93be56223fa21f9c.tar.bz2 platform_hardware_ril-44ccdd3fbc849a6cd5bdfaba93be56223fa21f9c.zip | |
Merge "Update language to comply with Android's inclusive language guidance" am: a0d65e2267 am: 04bff7f6c8 am: cb3ef0078b am: bec1491f5b
Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1375725
Change-Id: I4453ea831d3c2ef8d1434eacfe46e26521adcde6
| -rw-r--r-- | include/telephony/ril.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/telephony/ril.h b/include/telephony/ril.h index 75301466..c879873d 100644 --- a/include/telephony/ril.h +++ b/include/telephony/ril.h @@ -743,8 +743,8 @@ typedef struct { typedef struct { int32_t len_allowed_carriers; /* length of array allowed_carriers */ int32_t len_excluded_carriers; /* length of array excluded_carriers */ - RIL_Carrier * allowed_carriers; /* whitelist for allowed carriers */ - RIL_Carrier * excluded_carriers; /* blacklist for explicitly excluded carriers + RIL_Carrier * allowed_carriers; /* list of allowed carriers */ + RIL_Carrier * excluded_carriers; /* list of explicitly excluded carriers * which match allowed_carriers. Eg. allowed_carriers match * mcc/mnc, excluded_carriers has same mcc/mnc and gid1 * is ABCD. It means except the carrier whose gid1 is ABCD, |