Lucas Lin
2732048e77
Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b am: 71d233730c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705
Change-Id: Id6b542ca141ee2b06a6b082277fda333bd0bf8cf
2021-05-12 17:59:57 +00:00
Lucas Lin
bd90eed310
Merge "Update PrivateDnsMode from StringDef to IntDef" am: a23e55da49 am: da89f66c81
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562
Change-Id: I0b2ad20c59397395175b82688cfe657af43a1b19
2021-05-12 17:59:57 +00:00
Lucas Lin
97d4f16867
Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b am: 71d233730c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705
Change-Id: Ifaea1630983078ee810f1d495d0d63fe9acd9d1b
2021-05-12 17:59:30 +00:00
Lucas Lin
71d233730c
Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" am: d56f4a700b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1696705
Change-Id: I05089bdc7433ec244fe9be8cbc4e9afd40da0f27
2021-05-12 17:23:46 +00:00
Lucas Lin
da89f66c81
Merge "Update PrivateDnsMode from StringDef to IntDef" am: a23e55da49
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675562
Change-Id: I391d8dd2615f090d3112af69248aea70e334f62f
2021-05-12 17:23:45 +00:00
Lucas Lin
d56f4a700b
Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally"
2021-05-12 17:09:50 +00:00
Lucas Lin
a23e55da49
Merge "Update PrivateDnsMode from StringDef to IntDef"
2021-05-12 17:09:50 +00:00
satayev
8bb425a75e
Add bootclasspath_fragment.
...
Note that the contents of the bootclasspath_fragment are added as
dependencies to an apex, so there is no need to duplicate them in
java_libs.
Bug: 180105615
Test: atest CtsClasspathsTestCases
Ignore-AOSP-First: multiple previous changes aren't cherry-picked yet
Change-Id: Ia19ed0d5e13676882239dd5a1456c97549119994
2021-05-12 16:42:59 +01:00
Chalard Jean
18a5fac66a
Merge "Allow any transport with TEST if the network is restricted" am: 6e80f1c182 am: 5fdbf4d6de am: a6b91aafee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: Ib8ee3109ba5525ce1b1c6c2bd5ebcdc0b48a5319
2021-05-12 14:44:30 +00:00
Remi NGUYEN VAN
0ad85e3e5e
[automerger skipped] Merge "Use jniThrowErrnoException from JNIHelp" am: 25a08f056f am: e92d0602f1 am: b86c71b25a -s ours
...
am skip reason: Merged-In I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994 with SHA-1 c1f2d31b39 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: Ib3373d0634ceca77672cace31349edb4594fc46e
2021-05-12 14:43:22 +00:00
Remi NGUYEN VAN
7c690119f4
[automerger skipped] Merge "Move NetworkUtils JNI out of core/jni" am: 954385ffac am: 3c157047e2 am: d76107e54f -s ours
...
am skip reason: Merged-In I0b55dfe92f3cb6e848d79ac7953756f39aaa2597 with SHA-1 c58c993dda is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086
Change-Id: I3724d722bc66d3c54fe1c8cebacc65c3c097e5f8
2021-05-12 14:42:55 +00:00
Remi NGUYEN VAN
85b7ed0848
[automerger skipped] Merge "Build framework-connectivity using module_current" am: eb0961067e am: d1104c9620 am: b51eefe6de -s ours
...
am skip reason: Merged-In I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c with SHA-1 3b52af9c6e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I4cf3780210515b5849832055c88dd189d7d61177
2021-05-12 14:42:03 +00:00
Chalard Jean
a6b91aafee
Merge "Allow any transport with TEST if the network is restricted" am: 6e80f1c182 am: 5fdbf4d6de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: I8b42aa698f279774b8d5781811dc848c7d7ff713
2021-05-12 14:33:13 +00:00
Chalard Jean
5fdbf4d6de
Merge "Allow any transport with TEST if the network is restricted" am: 6e80f1c182
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489
Change-Id: Ic688c9d328242962c57631632b33236a69852ed6
2021-05-12 14:29:56 +00:00
Remi NGUYEN VAN
b86c71b25a
Merge "Use jniThrowErrnoException from JNIHelp" am: 25a08f056f am: e92d0602f1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: I52864a1dff894d827e97332ce9ddd506ae297270
2021-05-12 14:25:42 +00:00
Remi NGUYEN VAN
d76107e54f
Merge "Move NetworkUtils JNI out of core/jni" am: 954385ffac am: 3c157047e2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086
Change-Id: Icc10740c6f18755a86d4f3cc9fb59bcb6a933910
2021-05-12 14:25:23 +00:00
Remi NGUYEN VAN
b51eefe6de
Merge "Build framework-connectivity using module_current" am: eb0961067e am: d1104c9620
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I47046e76bab062d0f887f2f965c054054acba0c5
2021-05-12 14:25:00 +00:00
Remi NGUYEN VAN
e92d0602f1
Merge "Use jniThrowErrnoException from JNIHelp" am: 25a08f056f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: I6a1d75a1792883a7dc96c1beb108e83653c668a0
2021-05-12 14:17:28 +00:00
Remi NGUYEN VAN
3c157047e2
Merge "Move NetworkUtils JNI out of core/jni" am: 954385ffac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086
Change-Id: Icd812cda9e75015093080126bd20210034af5839
2021-05-12 14:13:20 +00:00
markchien
075432d7c9
Fix some TetheringCoverageTest failure
...
1. Fix no ACCESS_NETWORK_STATE permission problem when accessing
EthernetManager#getAvailableInterfaces API from S.
2. Fix some wrong jarjar rules.
Bug: 187371740
Test: atest TetheringCoverageTest on R platform
Change-Id: I203db6c4ea2e13d8fb5bc2db7ee877ccbb97b761
2021-05-12 14:12:10 +00:00
markchien
7193a1b30e
Test mts against last stable api level
...
Create *LatestSdk variant build target which have target sdk specify
to allow test apk install to released platform.
Bug: 182211575
Test: test S MtsTetheringTest in R device
Change-Id: I4d5c5e8c3d74993a67380e0211da31884cbf8792
2021-05-12 22:11:04 +08:00
Remi NGUYEN VAN
d1104c9620
Merge "Build framework-connectivity using module_current" am: eb0961067e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I67461b530e5292f94e3e1426ff0ec93ea657cf21
2021-05-12 14:05:55 +00:00
Chalard Jean
6e80f1c182
Merge "Allow any transport with TEST if the network is restricted"
2021-05-12 13:57:31 +00:00
Remi NGUYEN VAN
25a08f056f
Merge "Use jniThrowErrnoException from JNIHelp"
2021-05-12 13:12:32 +00:00
Remi NGUYEN VAN
954385ffac
Merge "Move NetworkUtils JNI out of core/jni"
2021-05-12 13:12:09 +00:00
Remi NGUYEN VAN
eb0961067e
Merge "Build framework-connectivity using module_current"
2021-05-12 13:11:22 +00:00
Hungming Chen
3feb782282
bpf: Add interface index to BPF devmap
...
Add upstream and downstream interface index to BPF map and rename the
BPF map name from xdp_devmap to dev.
$ adb shell dumpsys tethering
Device map:
ifindex (iface) -> ifindex (iface)
21 (21) -> 21 (21)
25 (25) -> 25 (25)
12 (rmnet_data2) -> 12 (rmnet_data2)
$ adb shell ip addr
12: rmnet_data2 ..
21: wlan1 ..
25: rndis0 ..
$ adb shell ls /sys/fs/bpf/tethering
map_offload_tether_dev_map
Test: atest TetheringCoverageTests
Change-Id: Ic49965f3374d9e196ee672ec2f0e9e08f3847deb
2021-05-12 19:57:18 +08:00
Lorenzo Colitti
b8537b5677
Remove dead code. am: 2422319cb7 am: 9d288a6904 am: 38bf66f05d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703126
Change-Id: I4741ac6eb7209821c1332ebd59ecfff09003b8c1
2021-05-12 11:29:12 +00:00
Lorenzo Colitti
c8984068bf
Remove mPublicSync. am: 94311aa902 am: c0f1bed8c5 am: b541f5fdfd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678387
Change-Id: Ice8198cb8e12a0db3e912545bc6772125c29b7c1
2021-05-12 11:29:10 +00:00
Lorenzo Colitti
2fde23a84e
Make Tethering#dump asynchronous. am: 5f729e14a3 am: c7a163bae8 am: 2bea99a840
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678386
Change-Id: I5d151bf57c814258aad86c383d4fcceb3a8ca81a
2021-05-12 11:29:09 +00:00
Lorenzo Colitti
4e3af62dd8
Skip presubmit for IPsec transport mode IPv6 TCP tests. am: b54bdabe5a am: 946da7b575 am: 7c9c64a663
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705126
Change-Id: Ia3aa14f30887f5b774ffacce6882a1e013e48f3d
2021-05-12 11:29:07 +00:00
Lorenzo Colitti
1284d846b0
Remove dead code. am: 2422319cb7 am: 9d288a6904 am: e91257ecf4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703126
Change-Id: If37743e00b8ef51f22fb167981e9a61f0349c05d
2021-05-12 11:22:30 +00:00
Lorenzo Colitti
8b381c19fc
Remove mPublicSync. am: 94311aa902 am: c0f1bed8c5 am: 1a56f34c7c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678387
Change-Id: Ie0ca3c2c7e38cb3c3823b975f565749e99cd8af5
2021-05-12 11:22:28 +00:00
Lorenzo Colitti
6cb74cf519
Make Tethering#dump asynchronous. am: 5f729e14a3 am: c7a163bae8 am: 778d795271
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678386
Change-Id: Ideb8059f0a47da50be761c9484e18622a02f01c9
2021-05-12 11:22:27 +00:00
Lorenzo Colitti
33f4ae3722
Skip presubmit for IPsec transport mode IPv6 TCP tests. am: b54bdabe5a am: 946da7b575 am: 7e41d51fa4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705126
Change-Id: I5a39cf5337bf83ab2266921664b34332cfa1666d
2021-05-12 11:22:25 +00:00
Lorenzo Colitti
38bf66f05d
Remove dead code. am: 2422319cb7 am: 9d288a6904
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703126
Change-Id: I3913a868982465f304ea5f48da538096dd900641
2021-05-12 10:55:46 +00:00
Lorenzo Colitti
e91257ecf4
Remove dead code. am: 2422319cb7 am: 9d288a6904
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703126
Change-Id: Ib82c7542b1fdf6d46182694a8b24147b3d7a3b25
2021-05-12 10:55:44 +00:00
Lorenzo Colitti
b541f5fdfd
Remove mPublicSync. am: 94311aa902 am: c0f1bed8c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678387
Change-Id: I8bc28ee7ed0a658e7218a00c82cb038a58c15d00
2021-05-12 10:55:44 +00:00
Lorenzo Colitti
1a56f34c7c
Remove mPublicSync. am: 94311aa902 am: c0f1bed8c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678387
Change-Id: Ie173e954e3ed27aebb73ebe2baefe3eff1c52556
2021-05-12 10:55:44 +00:00
Lorenzo Colitti
2bea99a840
Make Tethering#dump asynchronous. am: 5f729e14a3 am: c7a163bae8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678386
Change-Id: I000322644add81eb1bc366cf71e7cd308bcda555
2021-05-12 10:55:43 +00:00
Lorenzo Colitti
778d795271
Make Tethering#dump asynchronous. am: 5f729e14a3 am: c7a163bae8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678386
Change-Id: Iab29a982cdc237140820f15edc3fe80acaca5683
2021-05-12 10:55:42 +00:00
Lorenzo Colitti
7c9c64a663
Skip presubmit for IPsec transport mode IPv6 TCP tests. am: b54bdabe5a am: 946da7b575
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705126
Change-Id: I8d18d775806afdffbf08c2419c2f120ae806ad4d
2021-05-12 10:55:41 +00:00
Lorenzo Colitti
7e41d51fa4
Skip presubmit for IPsec transport mode IPv6 TCP tests. am: b54bdabe5a am: 946da7b575
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705126
Change-Id: Icc80118b56129d435c04b9837cfa72cc68c9d74e
2021-05-12 10:55:40 +00:00
Lorenzo Colitti
9d288a6904
Remove dead code. am: 2422319cb7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703126
Change-Id: I7c3990ac8943e30fae0508a1bda55db02e019a90
2021-05-12 10:41:17 +00:00
Lorenzo Colitti
c0f1bed8c5
Remove mPublicSync. am: 94311aa902
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678387
Change-Id: I72b34f951a036a7baa1f1f84a55820aa10970198
2021-05-12 10:41:16 +00:00
Lorenzo Colitti
c7a163bae8
Make Tethering#dump asynchronous. am: 5f729e14a3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1678386
Change-Id: Ifc7372870a3bf12251a909d84e1c9174531a87ec
2021-05-12 10:41:15 +00:00
Lorenzo Colitti
946da7b575
Skip presubmit for IPsec transport mode IPv6 TCP tests. am: b54bdabe5a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1705126
Change-Id: Iefb634b98f1f7e4420f40b80740eaaef4329e66e
2021-05-12 10:41:11 +00:00
Lorenzo Colitti
f3f275419d
Merge "Rename unwanted capabilities to forbidden capabilities." am: 0d942e81c7 am: 245e5cbe2b am: 3823e673eb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485
Change-Id: I9fcfd474b0cebdbadaad9466f5fb15b0069b55e6
2021-05-12 10:20:22 +00:00
Lorenzo Colitti
3823e673eb
Merge "Rename unwanted capabilities to forbidden capabilities." am: 0d942e81c7 am: 245e5cbe2b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485
Change-Id: I9b8a61b4c4a0059af294c2575e5339e7e3b9f3ed
2021-05-12 09:56:38 +00:00
Lorenzo Colitti
245e5cbe2b
Merge "Rename unwanted capabilities to forbidden capabilities." am: 0d942e81c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485
Change-Id: Iaf8da730305ed7294cc624d4d41b0a11f2872863
2021-05-12 09:15:30 +00:00