Automerger Merge Worker
d9a593bdce
Merge "[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours am: 9fe7c99cb1 -s ours" into rvc-d1-dev-plus-aosp am: 35e57d4794 -s ours am: b0d95f1bcd -s ours
...
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 6faf861994 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: I68960698fe47f926ff730a3a909b34a03abf45f4
2020-07-09 01:12:33 +00:00
Mark Chien
448d9073fe
[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 am: ea316b9be6 -s ours am: 6d2eefbcd0 -s ours am: 479f815664 -s ours
...
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 37ad92e058 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: Ie1f377c3446dda488d1301b55ff0251496d54056
2020-07-09 01:12:23 +00:00
Automerger Merge Worker
b0d95f1bcd
Merge "[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours am: 9fe7c99cb1 -s ours" into rvc-d1-dev-plus-aosp am: 35e57d4794 -s ours
...
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 6faf861994 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: I6d5340d966b851683223fc38049c9bdcfa60d3e1
2020-07-09 01:01:23 +00:00
Mark Chien
479f815664
[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 am: ea316b9be6 -s ours am: 6d2eefbcd0 -s ours
...
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 37ad92e058 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: I1af4570848b8271f13f291cbedbfc3c89ed74ec1
2020-07-09 01:00:58 +00:00
Automerger Merge Worker
35e57d4794
Merge "[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours am: 9fe7c99cb1 -s ours" into rvc-d1-dev-plus-aosp
2020-07-09 00:52:02 +00:00
Mark Chien
6d2eefbcd0
[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 am: ea316b9be6 -s ours
...
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 37ad92e058 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: Ideee4189dd6bcb987ccb887d15d2be9f5a3dfb04
2020-07-09 00:51:55 +00:00
Mark Chien
7add55f74c
[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours am: 9fe7c99cb1 -s ours
...
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 37ad92e058 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: Ic947249387fdf90c98d47c1775ea24e8f50286b0
2020-07-09 00:51:54 +00:00
Mark Chien
9fe7c99cb1
[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours
...
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 37ad92e058 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: Id285ac8febcc062375bda7c95ba824dc9dd4d3bf
2020-07-09 00:39:33 +00:00
Mark Chien
ea316b9be6
Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: Ib429b7ed5fddd2d1a766b8b2b7e57c191ce59559
2020-07-09 00:39:31 +00:00
Treehugger Robot
6faf861994
Skip testPhysicalEthernet if the test run adb over network
...
If the test run adb over network and ethernet is available, it is likely
that adb may run over ethernet. Then the test would fail because adb
would break when ethernet is switching from client mode to server mode.
Bug: 160389275
Test: atest CtsTetheringTest
Merged-In: I57d365d33316881c50c3bf7fd1c98926d10842d3
Change-Id: I57d365d33316881c50c3bf7fd1c98926d10842d3
2020-07-08 05:40:52 +00:00
Treehugger Robot
e8d41a3526
Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521 am: 10daa1daae am: c8f45d6350 am: bdb720dbc3 am: f5afab18f7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445
Change-Id: Ia80b411c3f5eac3f1154a02d88ef1b7fcea1a55a
2020-07-08 05:40:23 +00:00
Treehugger Robot
f5afab18f7
Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521 am: 10daa1daae am: c8f45d6350 am: bdb720dbc3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445
Change-Id: I81aa71a22ad812d617b69733d7a7c12925496878
2020-07-08 05:29:53 +00:00
Treehugger Robot
bdb720dbc3
Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521 am: 10daa1daae am: c8f45d6350
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445
Change-Id: I3b2027ad8685e9a5ebb7b06da412ab5a3f42ed2b
2020-07-08 05:16:10 +00:00
Treehugger Robot
c8f45d6350
Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521 am: 10daa1daae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445
Change-Id: I5e91a05d90f5f05cdbe7e7b30945d80832759bd2
2020-07-08 05:06:20 +00:00
Treehugger Robot
10daa1daae
Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445
Change-Id: I0d6eb8195743a6318c5adabb26d837ae35236c0d
2020-07-08 04:54:34 +00:00
Treehugger Robot
b68d322521
Merge "Skip testPhysicalEthernet if the test run adb over network"
2020-07-08 04:41:34 +00:00
Treehugger Robot
37219cfa5f
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 0052646bd6 -s ours am: 57a3f6e0af -s ours am: 324a662a89 -s ours am: 4f5776811a -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: Ib4dbd5d52c01ef0dfe82dc7856ab2ee252b42b58
2020-07-03 02:13:31 +00:00
Treehugger Robot
4f5776811a
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 0052646bd6 -s ours am: 57a3f6e0af -s ours am: 324a662a89 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 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
Treehugger Robot
324a662a89
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 0052646bd6 -s ours am: 57a3f6e0af -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: I8f5a2c331176a3e1a2c11aebe65a6a8799f309a2
2020-07-03 01:53:51 +00:00
Treehugger Robot
57a3f6e0af
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 0052646bd6 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: Ie3cef51a714de2c9111554c84a5e7aba49a4818f
2020-07-03 01:36:29 +00:00
Treehugger Robot
0052646bd6
Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: I472fd717d82304e4362c3075805b460b02a197e0
2020-07-03 00:54:07 +00:00
Chalard Jean
6b66d70ba1
Revert "Move Inet[4]AddressUtils to libs/net"
...
This reverts commit cf86031c12 .
Reason for revert: Breaks the build b/160390899
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
Change-Id: Ie10e66f61393602f17fbb61bf17230b176bf1f44
2020-07-02 23:47:35 +00:00
markchien
37ad92e058
Skip testPhysicalEthernet if the test run adb over network
...
If the test run adb over network and ethernet is available, it is likely
that adb may run over ethernet. Then the test would fail because adb
would break when ethernet is switching from client mode to server mode.
Bug: 160389275
Test: atest CtsTetheringTest
Change-Id: I57d365d33316881c50c3bf7fd1c98926d10842d3
2020-07-02 23:26:46 +08:00
Remi NGUYEN VAN
47305e5f83
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: e4116cf383 -s ours am: 4db7ca359f -s ours am: 68e2fd8b73 -s ours am: c67060fdba -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 e10b80de7d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: I03272ef7974005d932d640a8c06247dfde596607
2020-07-02 10:16:36 +00:00
Remi NGUYEN VAN
c67060fdba
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: e4116cf383 -s ours am: 4db7ca359f -s ours am: 68e2fd8b73 -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 e10b80de7d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: I50f022d349da36cb90e1fa3fc250659511d42d04
2020-07-02 10:03:06 +00:00
Remi NGUYEN VAN
68e2fd8b73
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: e4116cf383 -s ours am: 4db7ca359f -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 e10b80de7d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: Iad6a186fda02f69741ef0a2403e16973300bae1e
2020-07-02 09:52:45 +00:00
Remi NGUYEN VAN
4db7ca359f
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: e4116cf383 -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 e10b80de7d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: Iae9c8eb2e17130737e4cd30b03c4d20afbae6dc8
2020-07-02 09:39:11 +00:00
Remi NGUYEN VAN
e4116cf383
Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: I51d32e4efd0d9fc458b02022b6308920f7c812a9
2020-07-02 09:21:23 +00:00
Remi NGUYEN VAN
cf86031c12
Move Inet[4]AddressUtils to libs/net
...
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.
Also refine comments in DhcpResults following feedback in previous
change.
(cherry-pick from internal branch skipping wifi classes; no other
conflict)
Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Merged-In: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
2020-07-02 10:52:31 +09:00
Mark Chien
5564310782
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049 am: 13f66a7d24 -s ours am: 203c4f1978 -s ours am: 4fe609fa48 -s ours am: f6d68cfdc0 -s ours
...
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 683932315b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: I3a0afe948361ac81206310a1e29832fc6cbf28b6
2020-07-01 10:45:33 +00:00
Mark Chien
f6d68cfdc0
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049 am: 13f66a7d24 -s ours am: 203c4f1978 -s ours am: 4fe609fa48 -s ours
...
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 683932315b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: I7305fa95820376f517c7083def6e5ad4df585148
2020-07-01 10:28:38 +00:00
Mark Chien
4fe609fa48
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049 am: 13f66a7d24 -s ours am: 203c4f1978 -s ours
...
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 683932315b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: I746c6a4282f3ff0d32bf6db654bc3b75cfb14669
2020-07-01 10:11:30 +00:00
Mark Chien
203c4f1978
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049 am: 13f66a7d24 -s ours
...
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 683932315b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: I8940d70a097ca954ceec622ba42663a7fbf11c9c
2020-07-01 09:59:28 +00:00
Mark Chien
13f66a7d24
Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: Ia21b091951f7e5dd3f879d68414653a6c9ff8b25
2020-07-01 09:46:24 +00:00
Mark Chien
5ac18c5049
Merge "Fix tethering jarjar rule for LocalLog"
2020-07-01 09:30:24 +00:00
TreeHugger Robot
1a23ef9689
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 422c0ddfe6 am: ed7fbea66b am: be521eec2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I66f75314ac30311ec2d30b52c92f9cbd6c4a8488
2020-07-01 08:38:47 +00:00
Automerger Merge Worker
846b3d7c23
Merge "Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 1e6e79a7c3 am: fa99bb4b35" into rvc-qpr-dev-plus-aosp am: 998679cb27
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I4d59d30dd883b57d3be8ee79648549e0bccabc99
2020-07-01 08:38:14 +00:00
TreeHugger Robot
ad90011ead
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 1e6e79a7c3 am: 0a5a4e2548 am: f74260bd02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I3ad2bf851e26243e29d5fd60ef47e2c1f5afa245
2020-07-01 08:37:34 +00:00
TreeHugger Robot
be521eec2a
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 422c0ddfe6 am: ed7fbea66b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I981e33ff71cc1d746328fd11afe543fcf15fef40
2020-07-01 08:26:58 +00:00
Automerger Merge Worker
998679cb27
Merge "Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 1e6e79a7c3 am: fa99bb4b35" into rvc-qpr-dev-plus-aosp
2020-07-01 08:26:53 +00:00
TreeHugger Robot
27278a6f69
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 1e6e79a7c3 am: fa99bb4b35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I222a36d60bc8f8503a655bc87dab2a01fec9039e
2020-07-01 08:26:45 +00:00
TreeHugger Robot
f74260bd02
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 1e6e79a7c3 am: 0a5a4e2548
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I1bd69d3152fd30820d02d98bb873c7528c74bc7f
2020-07-01 08:26:33 +00:00
TreeHugger Robot
ed7fbea66b
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 422c0ddfe6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I0a6c2b29c04aa8105c8d1cf9075491d950912d29
2020-07-01 08:14:33 +00:00
TreeHugger Robot
0a5a4e2548
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 1e6e79a7c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I72bf0a2d89f2c9818ecc4bfd7fdada389fa81f1a
2020-07-01 08:14:03 +00:00
TreeHugger Robot
422c0ddfe6
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I8eec902878e34cb6a4ee7989d45cc0c7149c791c
2020-07-01 07:58:32 +00:00
TreeHugger Robot
1e6e79a7c3
Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945
Change-Id: I9db426581ba148b3743ac04a45af9bf4ea3089e4
2020-07-01 07:58:07 +00:00
markchien
683932315b
Fix tethering jarjar rule for LocalLog
...
LocalLog is in android.util* instead of android.net*.
No crash happened because the methods used by tethering are
@UnsupportedAppUsage.
Bug: 160113128
Test: atest TetheringTests
Change-Id: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56
2020-07-01 03:40:50 +00:00
markchien
a8ac97cf22
Fix tethering jarjar rule for LocalLog
...
LocalLog is in android.util* instead of android.net*.
No crash happen becaue the methods used by tethering are
@UnsupportedAppUsage.
Bug: 160113128
Test: atest TetheringTests
(cherry-pick from internal branch with conflicts)
Merged-In: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56
Change-Id: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56
2020-06-30 15:30:55 +00:00
Paul Hu
aebabf1f10
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742 am: b6958b47d9 am: 2ad5f4e82f am: 08a2695981
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: Ib65efbacaeae1c99c0d00c2bcf9f222bf9a32628
2020-06-29 12:55:53 +00:00
Paul Hu
08a2695981
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742 am: b6958b47d9 am: 2ad5f4e82f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: Ic957a19c9e6e82acf06072382c2c0e65629ff537
2020-06-29 12:41:49 +00:00