Paul Hu
bb1f4a6f2b
Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d am: 7e8f78291c am: aa4e34d823
...
Change-Id: I07dd1b7ef7f52c57a7d5020e4d274950923a50fb
2020-04-08 08:51:23 +00:00
Paul Hu
aa4e34d823
Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d am: 7e8f78291c
...
Change-Id: I3cfca08a475c2d0a8cc157011c41ce5a2d8f89ee
2020-04-08 08:29:52 +00:00
Paul Hu
7e8f78291c
Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d
...
Change-Id: I97924c2caf89eb6021e1b42c688c317a93b104fd
2020-04-08 08:12:25 +00:00
Paul Hu
77908d971d
Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911
...
Change-Id: I420e4c0f9ae9f95dec822257c5dabf10f9b79201
2020-04-08 07:57:59 +00:00
Paul Hu
3d363f0911
Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9
...
Change-Id: I89d306a86ae993b0fdc26c701624d5c6735f0df7
2020-04-08 07:46:52 +00:00
Paul Hu
9f33a5a7d9
Merge "Address aosp/1274403 leftover comment"
2020-04-08 07:36:35 +00:00
Automerger Merge Worker
2a07469306
Merge "Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458" into rvc-d1-dev-plus-aosp am: dc64ce7c0d am: e271f0784f
...
Change-Id: I4ef0b8c08c7fb621c11378846ab934d854c3fb18
2020-04-08 07:13:44 +00:00
Automerger Merge Worker
e271f0784f
Merge "Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458" into rvc-d1-dev-plus-aosp am: dc64ce7c0d
...
Change-Id: I80da3a609f7161964193a7f49358301fbd03e87b
2020-04-08 06:57:03 +00:00
Paul Hu
49d4e37c4f
Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458
...
Change-Id: Ibd1f9252d27063f1640646ef453eb91132f53937
2020-04-08 06:40:40 +00:00
Paul Hu
c05defa458
Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb
...
Change-Id: Icde8ef078ec5ebde8d9c978432a9aa12b7a1e3a9
2020-04-08 06:40:20 +00:00
Mark Chien
962210ab79
[automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c am: 7c543a1a90 am: e8809b74b1 -s ours am: 222d8b255d -s ours
...
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b
2020-04-08 06:35:29 +00:00
Paul Hu
525df29ccb
Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef
...
Change-Id: If65885435886fab23f7948900127df09f08c15f4
2020-04-08 06:24:03 +00:00
Mark Chien
222d8b255d
[automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c am: 7c543a1a90 am: e8809b74b1 -s ours
...
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b
2020-04-08 06:18:17 +00:00
Paul Hu
77f43e56ef
Merge "Fix TetheringIntegrationTests failure"
2020-04-08 06:12:29 +00:00
Mark Chien
e8809b74b1
Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c am: 7c543a1a90
...
Change-Id: I58ff75339f93ca53c1c39eca1eb65a2da6b5ff97
2020-04-08 06:12:01 +00:00
Mark Chien
95a7db45ea
[automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c -s ours am: f3de7fc1e4 -s ours am: bbfc91801b -s ours
...
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b
2020-04-08 06:08:21 +00:00
Mark Chien
b6159c7980
[automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours am: 56f867cfd4 -s ours am: 547dd723fa -s ours am: 6905710b8d -s ours
...
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b
2020-04-08 06:07:57 +00:00
Mark Chien
bbfc91801b
[automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c -s ours am: f3de7fc1e4 -s ours
...
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b
2020-04-08 06:07:37 +00:00
Mark Chien
6905710b8d
[automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours am: 56f867cfd4 -s ours am: 547dd723fa -s ours
...
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b
2020-04-08 06:07:04 +00:00
Mark Chien
f3de7fc1e4
[automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f am: 4cea68cf9c -s ours
...
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b
2020-04-08 06:06:34 +00:00
Mark Chien
4cea68cf9c
Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f
...
Change-Id: I5334805bc74c20d986375fc5558f4cd5ada11ecf
2020-04-08 05:55:35 +00:00
Mark Chien
547dd723fa
[automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours am: 56f867cfd4 -s ours
...
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b
2020-04-08 05:50:17 +00:00
Mark Chien
56f867cfd4
[automerger skipped] Merge "Add TetheringServiceTest unitest" into rvc-dev am: c920673e5f -s ours
...
am skip reason: Change-Id I68cd403302848c041444e6d47652435d67f59273 with SHA-1 e96f42d27b
2020-04-08 05:41:38 +00:00
paulhu
eaa2b0e30a
Address aosp/1274403 leftover comment
...
Bug: 152828142
Test: atest EntitlementManagerTest
Change-Id: I81f2d268c9f26bc4488b06032477a73d071f73f8
2020-04-08 11:45:08 +08:00
paulhu
d584d2fa36
Fix TetheringIntegrationTests failure
...
Bug: 150644681
Test: atest TetheringIntegrationTests
Change-Id: I5a537eca9b1aab3694a11a2dab147a31f289314c
2020-04-08 09:57:57 +08:00
Mark Chien
47c8b0f87e
Add TetheringServiceTest unitest
...
Bug: 145490751
Test: atest TetheringTests
Change-Id: Ia9e3232467c7db0e566cced84f3c72bbcd6512d6
Merged-In: I68cd403302848c041444e6d47652435d67f59273
(cherry picked from commit 790a4dd7d3aa813f15fe95c5bf3cef6dd734ce32)
2020-04-08 01:02:39 +00:00
Mark Chien
fbe8a3d909
Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9 am: 6ca4626803 am: 0a90c3b9b4 am: 1a69dade06
...
Change-Id: Ia9e3232467c7db0e566cced84f3c72bbcd6512d6
2020-04-07 16:17:49 +00:00
Mark Chien
1a69dade06
Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9 am: 6ca4626803 am: 0a90c3b9b4
...
Change-Id: I0d8afb5ffcba84116295c8adfe98ac638f9312e3
2020-04-07 16:15:29 +00:00
Luke Huang
02ab8737d0
Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a am: f49e7dfca9 am: 8518b55a0f am: 0a578f04e7 am: 906b906af6
...
Change-Id: If70288416cd1d6ec7a0d344ac7ab619fd290e2fc
2020-04-07 16:15:21 +00:00
Luke Huang
906b906af6
Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a am: f49e7dfca9 am: 8518b55a0f am: 0a578f04e7
...
Change-Id: I481ee7b23f87f91bef1f322ab0af6d30700cfcbc
2020-04-07 16:12:55 +00:00
Mark Chien
0a90c3b9b4
Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9 am: 6ca4626803
...
Change-Id: I86c09957155e04603dd5d23e95a571b4e53c8f37
2020-04-07 16:11:58 +00:00
Mark Chien
6ca4626803
Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9
...
Change-Id: Ib34e3b601e8f2bbb96c2a706d614696500cc18fc
2020-04-07 16:05:50 +00:00
Luke Huang
0a578f04e7
Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a am: f49e7dfca9 am: 8518b55a0f
...
Change-Id: I438680171292b044d0509a09e65a2cf08d6b1dff
2020-04-07 16:00:48 +00:00
Mark Chien
7f8095b2d9
Merge "Add TetheringServiceTest unitest" am: 7e0920903b
...
Change-Id: Ibc3a9a68df3400017fd8fc24af53e9c01708b11b
2020-04-07 15:50:32 +00:00
Luke Huang
8518b55a0f
Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a am: f49e7dfca9
...
Change-Id: Ie89032a792aa05c50530dcf4e67b96d0717c992c
2020-04-07 15:45:02 +00:00
Mark Chien
7e0920903b
Merge "Add TetheringServiceTest unitest"
2020-04-07 15:39:38 +00:00
Luke Huang
f49e7dfca9
Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a
...
Change-Id: I4680ab48740223fe128261ffd122c771cee52e98
2020-04-07 15:33:04 +00:00
Mark Chien
e578a211d4
[automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 am: 21b7d260cb am: d6e02a62d6 am: 2e394fd361 -s ours am: bfab169772 -s ours
...
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21
2020-04-07 08:55:56 +00:00
Mark Chien
bfab169772
[automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 am: 21b7d260cb am: d6e02a62d6 am: 2e394fd361 -s ours
...
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21
2020-04-07 08:36:51 +00:00
Luke Huang
6ca4ec97d2
Use the lastest frozen netd_aidl_interface in framework
...
Bug: 140541991
Test: build
Change-Id: I984969e09f8d5196945a7412c51bd8880223ad9e
2020-04-07 08:35:42 +00:00
Mark Chien
fdf6152335
[automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 -s ours am: 164ec44482 -s ours am: e879e08ae0 -s ours am: f1fa444b62 -s ours
...
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21
2020-04-07 08:24:54 +00:00
Mark Chien
faf98287d9
[automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 am: 21b7d260cb -s ours am: 76161686ff -s ours am: 671ffbd887 -s ours
...
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21
2020-04-07 08:24:35 +00:00
Mark Chien
f1fa444b62
[automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 -s ours am: 164ec44482 -s ours am: e879e08ae0 -s ours
...
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21
2020-04-07 08:24:30 +00:00
Mark Chien
671ffbd887
[automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 am: 21b7d260cb -s ours am: 76161686ff -s ours
...
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21
2020-04-07 08:24:19 +00:00
Mark Chien
2e394fd361
Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 am: 21b7d260cb am: d6e02a62d6
...
Change-Id: I97811d4d8f101098207a79e75684f59b2bd60d19
2020-04-07 08:23:36 +00:00
Mark Chien
e879e08ae0
[automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 -s ours am: 164ec44482 -s ours
...
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21
2020-04-07 08:11:02 +00:00
Mark Chien
76161686ff
[automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 am: 21b7d260cb -s ours
...
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21
2020-04-07 08:10:57 +00:00
Mark Chien
21b7d260cb
Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8
...
Change-Id: Ic4a4803bea140bc567e9a2a3e35a40652e7285be
2020-04-07 07:59:50 +00:00
Mark Chien
164ec44482
[automerger skipped] Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev am: 8caf921dc8 -s ours
...
am skip reason: Change-Id I939323ce09adb9c66b1e2b83d58b0f892aa8f011 with SHA-1 1b39a10c21
2020-04-07 07:59:18 +00:00
Mark Chien
8caf921dc8
Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev
2020-04-07 07:50:40 +00:00
