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
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
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
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
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
2ad5f4e82f
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742 am: b6958b47d9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: Ia843da82bc8fa03aca33a51fc309b65e73dfdc8f
2020-06-29 12:31:12 +00:00
Paul Hu
b6958b47d9
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514 am: 7a87bc4742
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: I67e2d4facd77f978255a10423a9baff231ac0695
2020-06-29 12:17:07 +00:00
Paul Hu
7a87bc4742
Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013
Change-Id: I2d1886c4bc2892d3673e87544e3e9c2bb0bb8633
2020-06-29 12:04:06 +00:00
Paul Hu
6b2b4e6514
Merge "Correct PendingIntent#getActivity() flags"
2020-06-29 11:53:18 +00:00
Treehugger Robot
175605dd27
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours am: a2d6b35eeb -s ours
...
am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea27274 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444
Change-Id: I1e88786727ec4a32665bf4b36e66f39bd58c672b
2020-06-29 04:41:02 +00:00
Treehugger Robot
a2d6b35eeb
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c am: 9fba78c098 -s ours
...
am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 0d0ea27274 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444
Change-Id: I86e4fca7fbec72a1cdbded8782afa22b211f2967
2020-06-29 04:29:37 +00:00
Treehugger Robot
9fba78c098
Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444
Change-Id: Ib2a16bd545b98a8d95338f6acce23e265ec5130a
2020-06-29 04:16:40 +00:00
Treehugger Robot
cdf6b4202c
Merge "Use unstable networkstack AIDLs in development branches"
2020-06-29 04:02:49 +00:00
paulhu
67aeab2eee
Correct PendingIntent#getActivity() flags
...
TetheringNotificationUpdater create a PendingIntent with
Intent#FLAG_ACTIVITY_NEW_TASK flag. But this flag is used for
Intent only. Thus, move this flag into Intent.
Bug: 158639789
Test: atest TetheringTests
Change-Id: I4c3af75c87b797bcde9356a94c835c7422dac1c6
2020-06-29 00:32:19 +08:00
Orion Hodson
e5fdcd86a2
[automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours am: 6c0e9f46cd -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I4b94400277e38db25c76e02f66e4f5f523358452
2020-06-25 08:32:19 +00:00
Orion Hodson
6b0056827f
[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours am: 77156e6721 -s ours
...
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: I812dfa946299dc565e915dcbabe43e1d74abeb1f
2020-06-25 08:32:12 +00:00
Orion Hodson
6c0e9f46cd
[automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I3bb4fbb8c5c7df3f43bb69e1228848540e1249f9
2020-06-25 08:13:32 +00:00
Orion Hodson
77156e6721
[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours
...
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: Ief614f159c1972c181986ae05b01b5dc2a92b1ee
2020-06-25 08:13:26 +00:00
Orion Hodson
9228c914d2
Merge changes from topic "lnh-platform-split" am: c6b2c39d04
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
2020-06-25 07:58:17 +00:00
Orion Hodson
1309dcd8de
Sync with libnativehelper refactoring am: 0cdccd707f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: I7511170930440ec5a1a8067b57a76a6c19484d71
2020-06-25 07:58:10 +00:00
Orion Hodson
c6b2c39d04
Merge changes from topic "lnh-platform-split"
...
* changes:
Update to use nativehelper/JNIPlatformHelp.h
Sync with libnativehelper refactoring
2020-06-25 07:36:05 +00:00
Orion Hodson
db4a0425f3
Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 1eff58da30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985379
Change-Id: I2c4432fd6aebf2706b2a927842d9fb21b09dd166
2020-06-24 21:23:34 +00:00
Orion Hodson
1eff58da30
Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp
2020-06-24 21:02:39 +00:00
Luke Huang
8fc588f87b
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours am: 04e5539162 -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I5af3e4f7a38fa4374a568dc99925b76fc0f033a6
2020-06-24 19:12:16 +00:00
Luke Huang
04e5539162
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I4bddd1c6f072845f1a62812995a3b4cb4299ccaa
2020-06-24 19:11:24 +00:00
Orion Hodson
0cdccd707f
Sync with libnativehelper refactoring
...
jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.
Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c4682505 )
2020-06-24 14:13:13 +01:00
Orion Hodson
697ec868d2
Sync with libnativehelper refactoring
...
jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.
Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c4682505 )
2020-06-24 12:47:10 +00:00
Luke Huang
895594dcc2
Move DnsPacket to libs net
...
This class might be used by some mainline modules.
Bug: 151052811
Test: atest DnsPacketTest
Test: atest DnsResolverTest
(clean cherry-pick from internal branch)
Merged-In: I8841d91456952ded5efbf8ea221289aecc7746ad
Change-Id: I8841d91456952ded5efbf8ea221289aecc7746ad
2020-06-24 11:32:26 +00:00
TreeHugger Robot
3edc33cc49
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -s ours am: 5c5ee11ba0 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 e8141aa9c3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: Ia4bbbe4ada4628fb18205bec5a4f66a03ba0c917
2020-06-24 06:57:17 +00:00
TreeHugger Robot
95ba1d0661
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: Ib4ece60f5283898764ffd23aea615060e2dbe348
2020-06-24 06:56:48 +00:00
TreeHugger Robot
91d1d07ff4
Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I70a9139123e5703607e2c011c7449e37880e78d5
2020-06-24 06:51:09 +00:00
TreeHugger Robot
5c5ee11ba0
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: Ib853e8dcf754451407ef858f3af766b9cab9696c
2020-06-24 06:50:26 +00:00