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
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
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
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
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
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
Junyu Lai
b20ac232a3
Revert "Attribute data usage to 5G for 5G non-standalone mode"
...
This reverts commit b04880e7ca .
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
90b89ee298
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: a1301d5850 am: 69b27184a7 am: 0527bf55f9
...
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
0527bf55f9
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: a1301d5850 am: 69b27184a7
...
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
69b27184a7
Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93 am: a1301d5850
...
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
a1301d5850
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
b04880e7ca
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
cdddbb9536
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 0cb16d1bb3 am: 7ce1646c8f am: 6f659fab51 am: 5ae4c18d16
...
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
5ae4c18d16
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 0cb16d1bb3 am: 7ce1646c8f am: 6f659fab51
...
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
6f659fab51
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 0cb16d1bb3 am: 7ce1646c8f
...
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
7ce1646c8f
Merge "[RFPM02] Add Dependencies class for injection in tests." am: 0cb16d1bb3
...
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
0cb16d1bb3
Merge "[RFPM02] Add Dependencies class for injection in tests."
2020-07-08 10:07:23 +00:00
Chalard Jean
5cab5d2773
Add some more public doc for MacAddress
...
Bug: 140807677
Test: doc-only change
Original-Change: https://android-review.googlesource.com/1354447
Merged-In: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
Change-Id: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
2020-07-08 09:38:37 +00:00
paulhu
9883de0b7f
[RFPM02] Add Dependencies class for injection in tests.
...
Add Dependencies class in PermissionMonitor for injection
in tests easily.
Bug: 132784544
Test: atests FrameworksNetTests
Change-Id: Ibb84d548908f7a955fa0ff206794486733259978
2020-07-08 15:30:42 +08:00
Chalard Jean
cbf467b809
Merge "Add some more public doc for MacAddress" am: a9a005de38 am: b81882f72c am: 2a4eed1edf am: 73542e440b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: Idb097086b514c76cd7601d833a5cfaedcdc1e616
2020-07-08 05:57:48 +00:00
Chalard Jean
73542e440b
Merge "Add some more public doc for MacAddress" am: a9a005de38 am: b81882f72c am: 2a4eed1edf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I52460b43a5d225668714c44fb5804899feb3b83a
2020-07-08 05:51:01 +00:00
Chalard Jean
2a4eed1edf
Merge "Add some more public doc for MacAddress" am: a9a005de38 am: b81882f72c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I5c9061fa832c75c9e0476c54bacec3deb114a96d
2020-07-08 05:38:59 +00:00
Chalard Jean
b81882f72c
Merge "Add some more public doc for MacAddress" am: a9a005de38
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354447
Change-Id: I1126b78eb886c5c84afa107b028fe2569d7573e4
2020-07-08 05:29:56 +00:00
Chalard Jean
a9a005de38
Merge "Add some more public doc for MacAddress"
2020-07-08 05:15:20 +00:00
Chalard Jean
bf8723b002
Add some more public doc for MacAddress
...
Bug: 140807677
Test: doc-only change
Change-Id: I0f6e59eda42fd92ec34db0e9bc2d26d2e83d41d0
2020-07-04 09:01:58 +09:00
Pavel Grafov
2161a10df2
Merge "Connectivity: start PAC global proxy after reboot." am: 840c688ba5 am: 70655e6270 am: 934d3eabf7 am: 59bcef85b5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599
Change-Id: I6f3630bc0b1fa148f7ec8d01c339803855e985ab
2020-07-03 12:02:44 +00:00
Pavel Grafov
59bcef85b5
Merge "Connectivity: start PAC global proxy after reboot." am: 840c688ba5 am: 70655e6270 am: 934d3eabf7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599
Change-Id: I2b42c88920c59bc26e2a6531e1812fa6afe9650a
2020-07-03 11:50:34 +00:00
Pavel Grafov
934d3eabf7
Merge "Connectivity: start PAC global proxy after reboot." am: 840c688ba5 am: 70655e6270
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599
Change-Id: I5bb6267ca876df8aef0b2df630c058726b195352
2020-07-03 11:38:59 +00:00
Pavel Grafov
70655e6270
Merge "Connectivity: start PAC global proxy after reboot." am: 840c688ba5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/431599
Change-Id: I31aa41a6268d88178c4a3f276c7ea7750695b417
2020-07-03 11:13:01 +00:00
Pavel Grafov
840c688ba5
Merge "Connectivity: start PAC global proxy after reboot."
2020-07-03 10:54:10 +00:00
Treehugger Robot
b5a61e1b72
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: a11688cabc -s ours am: e283f049b8 -s ours am: 54347a850e -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 edadfcfae1 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: I488aaec3e0edf160d30063c20090d428a0128b68
2020-07-03 02:04:29 +00:00