LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,882 Commits 2 Branches 0 Tags
9d5f64d15f3d71e683fac2bda6648f244d1036f9
Commit Graph

2882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
8399e3d5eb Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
 2020-08-31 21:21:38 -07:00
Treehugger Robot
e7077a7522 [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6 am: 0f61b833d5 -s ours am: 83f0491092 -s ours am: 53a9a4c3da -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 dad37d17fb is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: I672c162ac009e773f17c8e98d670dc745c5eca11
 2020-08-25 22:04:50 +00:00
Treehugger Robot
53a9a4c3da [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6 am: 0f61b833d5 -s ours am: 83f0491092 -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 dad37d17fb is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: Ifba95c25fab6decc52b78cc92c95b100d5066fb6
 2020-08-25 21:33:59 +00:00
Treehugger Robot
83f0491092 [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6 am: 0f61b833d5 -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 dad37d17fb is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: Iff9fe875b4e12d837e5fe52f956ff0f13d3c6ce3
 2020-08-25 21:09:22 +00:00
Treehugger Robot
0f61b833d5 Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 am: 445d5093c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: I34de6bc6dd862f8042489f60f4b6be76af7c961e
 2020-08-25 20:49:04 +00:00
Treehugger Robot
445d5093c6 Merge "Skip RAT type listener registration if IMSI is not available" am: ebae7edd37 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: Ie24dee18456ee0741dbcd9330664398f0492c644
 2020-08-25 20:27:30 +00:00
Treehugger Robot
ebae7edd37 Merge "Skip RAT type listener registration if IMSI is not available" 2020-08-25 19:55:09 +00:00
junyulai
a40b5dad28 Skip RAT type listener registration if IMSI is not available 
Currently, if SIM is inserted but IMSI is not available, such
as SIM PIN locked state. Information of such SIM will still
be available but IMSI is not. Which makes
NetworkStatsSubscriptionMonitor failed to store IMSI locally
for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is
always returned for such SIM.

Skip the registration until the IMSI is available. This is safe
since there will be another onSubscriptionsChanged event when
that happens.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Merged-In: I408379b3c432d9e62e0837d6b4f6551cc7838e29
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
(cherry-picked from ag/12400327)
 2020-08-25 18:03:38 +08:00
Automerger Merge Worker
11e26d0b89 [automerger skipped] Merge "Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: d74c016c09" into rvc-qpr-dev-plus-aosp am: 5c56b125e8 -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 dad37d17fb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I3dc4e0b8953dd51dea6233af6e71d1921d497b25
 2020-08-23 13:56:40 +00:00
TreeHugger Robot
59e00fcc52 [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: efe8bb2a2a am: 3475d22543 -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 43e9bf91cf is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I2d083962a1a9e8d92008bdb564708d4bc919b6f8
 2020-08-23 13:56:04 +00:00
Automerger Merge Worker
5c56b125e8 Merge "Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: d74c016c09" into rvc-qpr-dev-plus-aosp 2020-08-23 13:42:14 +00:00
TreeHugger Robot
dbaebf773d Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: d74c016c09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I0c3658f86f2d359778f63d3dfe4e682708ddbb71
 2020-08-23 13:41:55 +00:00
TreeHugger Robot
3475d22543 Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: efe8bb2a2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I8e6777e87c50699977316d88478f230fce494c42
 2020-08-23 13:41:47 +00:00
TreeHugger Robot
efe8bb2a2a Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: Ia10dc546e107e9c1fc249766c2bcfc5856ce1bd2
 2020-08-23 13:18:49 +00:00
Treehugger Robot
9393d01379 [automerger skipped] Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c am: ca4235f9a6 -s ours am: 5312ef34e0 -s ours am: f9f95947fb -s ours 
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 923ab36b89 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: I9632d9e663df445d337dbb55956edea8f95b9a30
 2020-08-20 05:10:53 +00:00
junyulai
2cd0f893f3 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e am: ea11e8a174 -s ours am: 2ec09ea15b -s ours am: ec46592a67 -s ours am: 82b1eb23c2 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 149a1cefe3 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: I8ce2b38b991e3a6fcc7966275169ab7d5aef9c35
 2020-08-20 05:10:37 +00:00
Treehugger Robot
f9f95947fb [automerger skipped] Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c am: ca4235f9a6 -s ours am: 5312ef34e0 -s ours 
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 923ab36b89 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: Ibb6e437300cba97e85a4d4f6f4574c1018d8c4f8
 2020-08-20 05:00:44 +00:00
junyulai
82b1eb23c2 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e am: ea11e8a174 -s ours am: 2ec09ea15b -s ours am: ec46592a67 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 eba72cd4ef is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: Ifd25659b5103031454cb1caa88189798f33b1fbf
 2020-08-20 05:00:30 +00:00
Treehugger Robot
5312ef34e0 [automerger skipped] Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c am: ca4235f9a6 -s ours 
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 923ab36b89 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: I626a13a0b12b1386b001de9d3e0bc978c0e48c6a
 2020-08-20 04:43:44 +00:00
junyulai
ec46592a67 [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e am: ea11e8a174 -s ours am: 2ec09ea15b -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 eba72cd4ef is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: I653f77d2f7d5b0b69602ab362888c43c1a2aceb3
 2020-08-20 04:43:33 +00:00
Treehugger Robot
ca4235f9a6 Merge changes I0faeda20,I726e74f5 am: c6a61f9eee am: 2c3d87e23c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: Ifa30f9611612523077a2b0c1c919e5035f5cd8e0
 2020-08-20 04:06:51 +00:00
junyulai
2ec09ea15b [automerger skipped] Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e am: ea11e8a174 -s ours 
am skip reason: Change-Id I726e74f5c63a6ed456cb13ea259b58c7a33bec76 with SHA-1 eba72cd4ef is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: I36cacaf70c7a067fc93d01d0f2c89a90cc2694ae
 2020-08-20 04:06:47 +00:00
Treehugger Robot
2c3d87e23c Merge changes I0faeda20,I726e74f5 am: c6a61f9eee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397954

Change-Id: I2adf488439c8aecf2d3dac2438b848bbdc868a21
 2020-08-20 03:56:13 +00:00
junyulai
ea11e8a174 Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953

Change-Id: I4bfdd2dcc7bd6b1e15248d7ef855fc40db018c4a
 2020-08-20 03:56:10 +00:00
Treehugger Robot
c6a61f9eee Merge changes I0faeda20,I726e74f5 
* changes:
  Add 5G NSA to collapsed RAT types list
  Add getAllCollapsedRatTypes to NetworkTemplate
 2020-08-20 03:44:07 +00:00
Junyu Lai
8c8fe82145 Merge "Skip RAT type listener registration if IMSI is not available" 2020-08-20 02:20:31 +00:00
junyulai
dad37d17fb Skip RAT type listener registration if IMSI is not available 
Currently, if SIM is inserted but IMSI is not available, such
as SIM PIN locked state. Information of such SIM will still
be available but IMSI is not. Which makes
NetworkStatsSubscriptionMonitor failed to store IMSI locally
for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is
always returned for such SIM.

Skip the registration until the IMSI is available. This is safe
since there will be another onSubscriptionsChanged event when
that happens.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Merged-In: I408379b3c432d9e62e0837d6b4f6551cc7838e29
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
(cherry-picked from ag/12400327)
 2020-08-19 09:53:20 +00:00
junyulai
43e9bf91cf Skip RAT type listener registration if IMSI is not available 
Currently, if SIM is inserted but IMSI is not available, such
as SIM PIN locked state. Information of such SIM will still
be available but IMSI is not. Which makes
NetworkStatsSubscriptionMonitor failed to store IMSI locally
for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is
always returned for such SIM.

Skip the registration until the IMSI is available. This is safe
since there will be another onSubscriptionsChanged event when
that happens.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
 2020-08-19 15:15:51 +08:00
Roshan Pius
311d14bde4 Merge "WifiP2pManager: Plumb package name to service" 2020-08-13 03:29:03 +00:00
Roshan Pius
a61dac1417 WifiP2pManager: Plumb package name to service 
Will be used for prioritization of different ifaces in HDM.

Bug: 162344695
Test: atest com.android.server.wifi
Change-Id: Iac1447390f7329768b9c307b08d28ebbd4ea3b90
 2020-08-12 06:39:30 -07:00
Chiachang Wang
e4a3f3d6c1 Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: e15e314aad am: 2a0b75be4c am: 06f68e1736 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ib455b42f7f360b75a295f86fd5166125fd0f69aa
 2020-08-12 10:58:30 +00:00
Chiachang Wang
06f68e1736 Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: e15e314aad am: 2a0b75be4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: I0d9947b6e4591d515a3c318be38e3c46a119a7f7
 2020-08-12 10:43:42 +00:00
Chiachang Wang
2a0b75be4c Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: e15e314aad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ib078acdf9210f7c80b5cdb50ae5b860aea2a5626
 2020-08-12 10:28:50 +00:00
junyulai
fd139892de Add 5G NSA to collapsed RAT types list 
Currently, getAllCollapsedRatTypes is used to retrieve
all RAT types which will be recorded into NetworkStatsService.
However, there is a missing part that 5G NSA virtual RAT type
is not added into this list. This makes callers such as statsd
do not aware of 5G NSA RAT type and missed to collect data
usage of it.

Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Test: adb shell cmd stats pull-source 10082
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Test: atest UidAtomTests#testMobileBytesTransfer \
      UidAtomTests#testMobileBytesTransferByFgBg \
      UidAtomTests#testDataUsageBytesTransfer
Bug: 163021464
Change-Id: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
Merged-In: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
(cherry-picked from ag/12355984)
 2020-08-12 10:12:48 +00:00
Chiachang Wang
e15e314aad Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ibe13b2dad841e2ade2762558d1c3978a89cb825d
 2020-08-12 10:10:11 +00:00
junyulai
199f353a9e Add getAllCollapsedRatTypes to NetworkTemplate 
This is a partial cherry-pick of ag/10293594

Test: TH
Bug: 129082217

Merged-In: I726e74f5c63a6ed456cb13ea259b58c7a33bec76
Change-Id: I726e74f5c63a6ed456cb13ea259b58c7a33bec76
 2020-08-12 18:01:13 +08:00
junyulai
c4d0f79462 [automerger skipped] Add 5G NSA to collapsed RAT types list am: 923ab36b89 am: ef29845f01 am: 50a4ef97f3 -s ours 
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 fd54bcf23f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12355984

Change-Id: I7e9ec32d8619cb3527beace1b9c080b75c0fa204
 2020-08-12 09:34:24 +00:00
junyulai
50a4ef97f3 Add 5G NSA to collapsed RAT types list am: 923ab36b89 am: ef29845f01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12355984

Change-Id: I37ea30affa142ecf13c9dab6fca44266e8547202
 2020-08-12 09:15:41 +00:00
junyulai
ef29845f01 Add 5G NSA to collapsed RAT types list am: 923ab36b89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12355984

Change-Id: I7afb61046da5e7381604ec7407ca80d0f42bcb0c
 2020-08-12 08:56:39 +00:00
junyulai
923ab36b89 Add 5G NSA to collapsed RAT types list 
Currently, getAllCollapsedRatTypes is used to retrieve
all RAT types which will be recorded into NetworkStatsService.
However, there is a missing part that 5G NSA virtual RAT type
is not added into this list. This makes callers such as statsd
do not aware of 5G NSA RAT type and missed to collect data
usage of it.

Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Test: adb shell cmd stats pull-source 10082
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Test: atest UidAtomTests#testMobileBytesTransfer \
      UidAtomTests#testMobileBytesTransferByFgBg \
      UidAtomTests#testDataUsageBytesTransfer
Bug: 163021464
Change-Id: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
Merged-In: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
 2020-08-12 05:21:23 +00:00
junyulai
fd54bcf23f Add 5G NSA to collapsed RAT types list 
Currently, getAllCollapsedRatTypes is used to retrieve
all RAT types which will be recorded into NetworkStatsService.
However, there is a missing part that 5G NSA virtual RAT type
is not added into this list. This makes callers such as statsd
do not aware of 5G NSA RAT type and missed to collect data
usage of it.

Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Test: adb shell cmd stats pull-source 10082
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Test: atest UidAtomTests#testMobileBytesTransfer \
      UidAtomTests#testMobileBytesTransferByFgBg \
      UidAtomTests#testDataUsageBytesTransfer
Bug: 163021464
Change-Id: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
 2020-08-12 05:20:54 +00:00
Chiachang Wang
2fea4a758b Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code
for reference.

Bug: 161896447
Test: m ; atest FrameworkNetTests
Change-Id: Ib6b4c9526992c31e05e82be80e2b9b86bc0b57ef
 2020-08-12 12:23:59 +08:00
Chiachang Wang
0f2cebfb52 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code
for reference.

Test: m ; atest TetheringTests
Bug: 161896447
Change-Id: Idc58697c72fb00896bee00185fefc50c1a24dd35
Merged-In: Idc58697c72fb00896bee00185fefc50c1a24dd35
 2020-08-07 05:40:26 +00:00
Peter Wang
51716751b9 [automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: b6ff6f6c2c am: 4b6112a42c -s ours am: 86383582b4 -s ours am: a0988882c1 -s ours am: 3b7dd48ddb -s ours 
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 9487c9e513 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: Ifc57a2934b10301dc50e448cf6603a211500acf9
 2020-07-31 10:47:42 +00:00
Peter Wang
3b7dd48ddb [automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: b6ff6f6c2c am: 4b6112a42c -s ours am: 86383582b4 -s ours am: a0988882c1 -s ours 
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: Ic30f3dc44333a759d86920c5c9d8588d5142eec3
 2020-07-31 10:18:58 +00:00
Peter Wang
a0988882c1 [automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: b6ff6f6c2c am: 4b6112a42c -s ours am: 86383582b4 -s ours 
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: Ic15254afce6f13f0553faf9ec98fc16fe9563c81
 2020-07-31 09:55:23 +00:00
Peter Wang
86383582b4 [automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: b6ff6f6c2c am: 4b6112a42c -s ours 
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: I1e06f6cdb0e69e06cf94a543eec83478dabeda14
 2020-07-31 09:34:47 +00:00
Peter Wang
b6ff6f6c2c Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" 2020-07-31 08:43:44 +00:00
Chiachang Wang
c7e9b25f7b Merge "Update language to comply with Android's inclusive language guidance" am: ae5caa0013 am: 36a22f06b1 am: 1aafac2782 am: 38b7647244 am: 1012aaa906 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618

Change-Id: Ib1c23f0a9758bdcf55d11ac67ff6ff54dc513066
 2020-07-31 01:10:21 +00:00
Chiachang Wang
1012aaa906 Merge "Update language to comply with Android's inclusive language guidance" am: ae5caa0013 am: 36a22f06b1 am: 1aafac2782 am: 38b7647244 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618

Change-Id: Ic73d5ae40bfe8e37bbe96b96d6975e305f4c849c
 2020-07-31 00:24:20 +00:00