Chiachang Wang
d3bd1a5cf2
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290 am: f61e400585 am: 0b63167552 am: 1411f69053
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: Ideecaaaa12e82c5771e75d0c743228f6478e1ca3
2020-07-28 12:03:04 +00:00
Chiachang Wang
1411f69053
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290 am: f61e400585 am: 0b63167552
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I725e6a7b199837b673531fcc458f97a1e325ef56
2020-07-28 11:46:59 +00:00
Chiachang Wang
0b63167552
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290 am: f61e400585
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I2efddd398c4d7cf4d65f1c76c399a3a07a843889
2020-07-28 11:31:06 +00:00
Chiachang Wang
f61e400585
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad am: 261dd20290
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I9318abb0233e7b8847466914724eeaae769ea9c8
2020-07-28 11:19:47 +00:00
Chiachang Wang
261dd20290
Merge "Update language to comply with Android's inclusive language guidance" am: 7c1142d4ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: Ifcb4682d75b8df577281030c58b61eff53e6ae20
2020-07-28 11:04:20 +00:00
Chiachang Wang
7c1142d4ad
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-28 10:51:53 +00:00
Chiachang Wang
7d5f378d5b
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
Change-Id: I6c3c03c0c2d1302af6d5245486823c13a3432900
2020-07-28 15:36:30 +08:00
Aaron Huang
7434b3ec91
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: a46e5911ee am: e0ca014302 am: 6232225d8b am: f92fff0681 am: f07ec87525
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: I7965efe61d17ad96d1ff409b57c126e3c8f7fc78
2020-07-17 06:49:40 +00:00
Aaron Huang
f07ec87525
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: a46e5911ee am: e0ca014302 am: 6232225d8b am: f92fff0681
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: Ifd73e18235961e33b61331753193bbdc2646b7a4
2020-07-17 06:30:55 +00:00
Aaron Huang
f92fff0681
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: a46e5911ee am: e0ca014302 am: 6232225d8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: I9d141616f0efb16874488489f5c382a5eb7f6048
2020-07-17 06:18:09 +00:00
Aaron Huang
6232225d8b
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: a46e5911ee am: e0ca014302
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: If60a348768c507153c1a9038953b2f6c29fc8f03
2020-07-17 06:05:38 +00:00
Aaron Huang
e0ca014302
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: a46e5911ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: Ib3e7b1ff5c2fbe3fd9a049b58faf26a6c355ad8f
2020-07-17 05:53:43 +00:00
Aaron Huang
a46e5911ee
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)"
2020-07-17 05:40:31 +00:00
Automerger Merge Worker
c7a7fff377
[automerger skipped] Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp am: 91e141d436 -s ours am: 5e43961bd4 -s ours
...
am skip reason: Change-Id I7d98ab425852ffa064c68f5dc50bd1f5a4a49ab9 with SHA-1 472144c35a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028
Change-Id: I8d7e1601bb3d0943d0da103e1568cb31e5129ef4
2020-07-17 04:50:16 +00:00
Automerger Merge Worker
df428e334e
[automerger skipped] Merge changes from topic "am-3081ec444acb4d69974a1b8546d081d1" into rvc-qpr-dev-plus-aosp am: f8917c64fa -s ours
...
am skip reason: Change-Id I7d98ab425852ffa064c68f5dc50bd1f5a4a49ab9 with SHA-1 472144c35a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028
Change-Id: I0b1cd2d835c74dd9dcbfc636a61960d7783350f7
2020-07-17 04:50:02 +00:00
junyulai
cf0c3432f0
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 94f8240582 -s ours am: 82d651a2cf -s ours am: 5f840b4b07 -s ours am: 39372755cd -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 fef7a257be is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I79d8719de8a7550a0b4666b3864b565342d06944
2020-07-17 04:49:20 +00:00
Automerger Merge Worker
5e43961bd4
[automerger skipped] Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp am: 91e141d436 -s ours
...
am skip reason: Change-Id I7d98ab425852ffa064c68f5dc50bd1f5a4a49ab9 with SHA-1 472144c35a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028
Change-Id: I05486888bbb04e45be7978dc4fdd0ae8adca3f04
2020-07-17 04:33:12 +00:00
Automerger Merge Worker
f8917c64fa
Merge changes from topic "am-3081ec444acb4d69974a1b8546d081d1" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070 am: 2909a2ae8f
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 94f8240582 am: d9dd916001 am: fe9d1d5eb1 -s ours
2020-07-17 04:33:09 +00:00
junyulai
bc986d8783
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 94f8240582 am: d9dd916001 am: fe9d1d5eb1 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 384ee54683 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I7c339c9ddebf1f2c3b9fdb61fa728006f1017728
2020-07-17 04:32:43 +00:00
junyulai
39372755cd
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 94f8240582 -s ours am: 82d651a2cf -s ours am: 5f840b4b07 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 384ee54683 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: Ic05abb50b8115e619ca60b42c8de31d0a9a3369f
2020-07-17 04:32:41 +00:00
Automerger Merge Worker
91e141d436
Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp
...
* changes:
Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 94f8240582 am: d9dd916001 -s ours
2020-07-17 04:19:57 +00:00
junyulai
5f840b4b07
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 94f8240582 -s ours am: 82d651a2cf -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 384ee54683 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I02095d84ee19167ca7e254e977e1e38ba7ba87f0
2020-07-17 04:19:45 +00:00
junyulai
7381b429c9
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 94f8240582 am: d9dd916001 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 384ee54683 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I5e06da5cbb80d02e8d216d63c9c9c0f96a11fc6c
2020-07-17 04:19:23 +00:00
junyulai
82d651a2cf
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 94f8240582 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 384ee54683 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I7e48e1b94107d84a1b828b005437ad2e24a92850
2020-07-17 04:03:35 +00:00
junyulai
d9dd916001
Attribute data usage to virtual RAT type for 5G non-standalone mode am: 94f8240582
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I77a3455318db44cf28ca4cfddf86a9767efe6302
2020-07-17 04:03:07 +00:00
Treehugger Robot
7e082fa549
[automerger skipped] Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 1429504583 am: 01b83e0493 am: 01f048c36d am: d045f4633f am: ee7c7d82d4 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 fef7a257be is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: I46ebe986b4bb88e021166d83788ec9926c358e4d
2020-07-16 12:55:18 +00:00
Treehugger Robot
ee7c7d82d4
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 1429504583 am: 01b83e0493 am: 01f048c36d am: d045f4633f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: Iee2d99fa2288d026a7bda193ade2105d5a5b8454
2020-07-16 12:38:22 +00:00
Treehugger Robot
d045f4633f
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 1429504583 am: 01b83e0493 am: 01f048c36d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: I828f3f4f4f81d9a43c403d0a6a6b6f4e2bc1b654
2020-07-16 12:21:14 +00:00
Treehugger Robot
01f048c36d
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 1429504583 am: 01b83e0493
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: Idef0dd6e0e0486b76c0067540e580d444e97d6a0
2020-07-16 12:09:04 +00:00
Treehugger Robot
01b83e0493
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 1429504583
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: I74242ad8ffae7aa7bcf0562eee577d7f66747f09
2020-07-16 11:57:03 +00:00
Treehugger Robot
1429504583
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode"
2020-07-16 11:43:51 +00:00
junyulai
384ee54683
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
2020-07-16 18:22:09 +08:00
junyulai
94f8240582
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
2020-07-16 15:33:35 +08:00
junyulai
fef7a257be
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
2020-07-16 15:32:01 +08:00
Treehugger Robot
2e5f2ae310
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: f9c09d213c am: 867430ae1d am: 4232af7e40 am: 41029e25ce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: I6dfb1ec8e41adf39dce5361389e471e83425bc4e
2020-07-10 06:17:03 +00:00
Treehugger Robot
41029e25ce
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: f9c09d213c am: 867430ae1d am: 4232af7e40
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: I23a700b7166057d1bd65120abf0340ff49285248
2020-07-10 06:03:29 +00:00
Treehugger Robot
4232af7e40
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: f9c09d213c am: 867430ae1d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: I76f64267c5cbe4516602f8526d6f8fee452c46bb
2020-07-10 05:51:55 +00:00
Chalard Jean
9d98786479
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours am: 51512990d7 -s ours am: 136c92dae7 -s ours am: 598f33df42 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 5cab5d2773 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: I53294593b235505e9ed847c711bfb647cdb561b0
2020-07-10 05:41:52 +00:00
Automerger Merge Worker
b7084f1c8f
Merge "[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 66ce2fc90e -s ours am: de1a8ec625 -s ours" into rvc-qpr-dev-plus-aosp am: d58b127160 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 5cab5d2773 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: I3e10401d02360f2e3d410cd4839cf27721552450
2020-07-10 05:41:34 +00:00
Chalard Jean
89b84788cc
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 66ce2fc90e am: 00945cd6be -s ours am: edb30392ea -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 bf8723b002 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: Iab26fba40a5c4598c3a34c737a944135eebb0e72
2020-07-10 05:41:22 +00:00
Treehugger Robot
867430ae1d
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: f9c09d213c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: If052329128326fba72ff27c024a2c6652b7bb1ef
2020-07-10 05:41:05 +00:00
Chalard Jean
598f33df42
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours am: 51512990d7 -s ours am: 136c92dae7 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 5cab5d2773 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: Ic4c6d979ac48168bc812c5d0751cd2566b7e7edf
2020-07-10 05:26:53 +00:00
Treehugger Robot
f9c09d213c
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: I0b5da0e4e20cbd2dd5856b04d1f1ddfe3323b10b
2020-07-10 05:26:41 +00:00
Automerger Merge Worker
d58b127160
Merge "[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 66ce2fc90e -s ours am: de1a8ec625 -s ours" into rvc-qpr-dev-plus-aosp
2020-07-10 05:26:28 +00:00
Chalard Jean
edb30392ea
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 66ce2fc90e am: 00945cd6be -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 bf8723b002 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: I68192f884efc00f774c4ab1c92e980a2b0c71a94
2020-07-10 05:26:21 +00:00
Chalard Jean
88e0cc3f4b
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 66ce2fc90e -s ours am: de1a8ec625 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 bf8723b002 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: If74ca7d18ae5b1cfe69397d94bf272a8045d607c
2020-07-10 05:26:18 +00:00
Chalard Jean
136c92dae7
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours am: 51512990d7 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 bf8723b002 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: Id150062dfb212e61f326084f8d65bb8d71f154f2
2020-07-10 05:13:08 +00:00
Chalard Jean
de1a8ec625
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 66ce2fc90e -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 bf8723b002 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: I760d9a35c18ed1e5e603aac5a79c710585e16e3f
2020-07-10 05:12:59 +00:00
Chalard Jean
51512990d7
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 bf8723b002 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: Ie9e902ce58b8c6641967c8c6a4fa74cefcf49ab1
2020-07-10 05:00:57 +00:00
Chalard Jean
66ce2fc90e
Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12107302
Change-Id: I2dedf3b86e1ecdb36ebfe67397de9664057fc786
2020-07-10 05:00:54 +00:00