Chiachang Wang
9f458f9e81
Merge "Update language to comply with Android's inclusive language guidance" am: f702025bdf am: ef723b7617 am: 6d70190fcd am: 0005a7413f
...
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
0005a7413f
Merge "Update language to comply with Android's inclusive language guidance" am: f702025bdf am: ef723b7617 am: 6d70190fcd
...
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
6d70190fcd
Merge "Update language to comply with Android's inclusive language guidance" am: f702025bdf am: ef723b7617
...
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
ef723b7617
Merge "Update language to comply with Android's inclusive language guidance" am: f702025bdf
...
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
f702025bdf
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-28 10:51:53 +00:00
Chiachang Wang
3b9549f408
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
0eb3bc5de2
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e am: 5463bbece5 am: 8f98e732a0 am: 030846ecd6
...
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
030846ecd6
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e am: 5463bbece5 am: 8f98e732a0
...
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
8f98e732a0
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e am: 5463bbece5
...
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
5463bbece5
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: c36f17d32e
...
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
c36f17d32e
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)"
2020-07-17 05:40:31 +00:00
Automerger Merge Worker
bd0bf50406
[automerger skipped] Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp am: cb2b9ee0b5 -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
f4a695a651
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: 2774832382 am: 478dc7584e am: fe9d1d5eb1 -s ours
2020-07-17 04:33:09 +00:00
junyulai
6dea3f613d
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 2774832382 am: 478dc7584e am: fe9d1d5eb1 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 c3e3a1d0ef 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
c15421cfbf
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 2774832382 -s ours am: fbb36e7d8e -s ours am: f430bda314 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 c3e3a1d0ef 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
cb2b9ee0b5
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: 2774832382 am: 478dc7584e -s ours
2020-07-17 04:19:57 +00:00
junyulai
f430bda314
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 2774832382 -s ours am: fbb36e7d8e -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 c3e3a1d0ef 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
98ae85ba43
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 2774832382 am: 478dc7584e -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 c3e3a1d0ef 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
fbb36e7d8e
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: 2774832382 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 c3e3a1d0ef 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
478dc7584e
Attribute data usage to virtual RAT type for 5G non-standalone mode am: 2774832382
...
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
8680b13f39
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 0ac564e673 am: 0c55907a0a am: dc4c9d51a1 am: fc30f807e6
...
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
fc30f807e6
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 0ac564e673 am: 0c55907a0a am: dc4c9d51a1
...
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
dc4c9d51a1
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 0ac564e673 am: 0c55907a0a
...
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
0c55907a0a
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: 0ac564e673
...
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
0ac564e673
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode"
2020-07-16 11:43:51 +00:00
junyulai
c3e3a1d0ef
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
2774832382
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
Treehugger Robot
cc061e31d9
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: ce769a0d8e am: a3d509537c am: 086c1718ec
...
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
086c1718ec
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: ce769a0d8e am: a3d509537c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360157
Change-Id: I76f64267c5cbe4516602f8526d6f8fee452c46bb
2020-07-10 05:51:55 +00:00
Treehugger Robot
a3d509537c
Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: ce769a0d8e
...
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
e79a40cbf4
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours am: 9816816837 -s ours am: 2f1779db13 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 9aa3127449 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
ce769a0d8e
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
43b5887077
Merge "[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 8b0411b4f6 -s ours am: 843b8731a0 -s ours" into rvc-qpr-dev-plus-aosp
2020-07-10 05:26:28 +00:00
Chalard Jean
6e65f1ac8d
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 8b0411b4f6 am: 00945cd6be -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 ded38fda42 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
86add073c4
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 8b0411b4f6 -s ours am: 843b8731a0 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 ded38fda42 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
2f1779db13
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 -s ours am: 9816816837 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 ded38fda42 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
843b8731a0
[automerger skipped] Merge "Add some more public doc for MacAddress" into rvc-dev am: 2ddb47fa19 am: 8b0411b4f6 -s ours
...
am skip reason: Change-Id I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0 with SHA-1 ded38fda42 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
9816816837
[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 ded38fda42 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
8b0411b4f6
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
Junyu Lai
43b3142dc3
Revert "Attribute data usage to 5G for 5G non-standalone mode"
...
This reverts commit dc31686c31 .
Reason for revert: Revert and wait for the design is settled down.
Change-Id: I10fdfc37d6456678de1886698cd6ad08bf8aa810
2020-07-10 03:43:19 +00:00
Junyu Lai
d80b9aad4b
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: 214280263e am: 7249a46c8e am: fad1e96976
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: I7e7b758f7fba46bcdd9a79c675adffd831f2b1fe
2020-07-10 03:31:13 +00:00
Junyu Lai
fad1e96976
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: 214280263e am: 7249a46c8e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: I845221848bb00355db98f0aa5a4341641e3ceec7
2020-07-10 03:21:43 +00:00
Junyu Lai
7249a46c8e
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: 214280263e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: I860b0226157ee31f0488d6b2252ae157e86dc5eb
2020-07-10 03:10:15 +00:00
Junyu Lai
214280263e
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1359203
Change-Id: I89ed9dd80f6b30e43e59d91fdd3fb91fb0e9be45
2020-07-10 02:56:44 +00:00
junyulai
dc31686c31
Attribute data usage to 5G for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I563df14500caeb3602b381479afaf5163ad8e6a1
2020-07-09 16:56:54 +08:00
Paul Hu
7755fff147
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 27cba24934 am: 9778855eb6 am: 99670e6e0c am: 7d4bc08e50
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: I59c4e365ba222b87c2943e3e23ccf3eb329f56e3
2020-07-08 10:59:01 +00:00
Paul Hu
7d4bc08e50
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 27cba24934 am: 9778855eb6 am: 99670e6e0c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: Id5b673bee68adda4991633d09db8f17055775cde
2020-07-08 10:47:44 +00:00
Paul Hu
99670e6e0c
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 27cba24934 am: 9778855eb6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: If53e1521327c8d9f1fd2a5debb94c58ed25b2880
2020-07-08 10:35:21 +00:00
Paul Hu
9778855eb6
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 27cba24934
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1318291
Change-Id: Ibc81b90c9a7428f63afcb6bad27eb593cf2f628e
2020-07-08 10:24:36 +00:00
Paul Hu
27cba24934
Merge "[RFPM02] Add Dependencies class for injection in tests."
2020-07-08 10:07:23 +00:00