Maciej Żenczykowski
e9810ffef1
move bpf test map into a separate file
...
This allows for better separation of test vs production code:
we will add more test maps and programs here later.
Test: builds
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I7b22e3e148ebf43fdf43dc68d0dea354f7627688
2021-01-18 18:36:00 -08:00
Remi NGUYEN VAN
a8208c50f8
Merge "Revert^2 "Add service-connectivity to tethering APEX"" am: 73fa31b404 am: f3b8223844
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14b6da2e75fce0274e64701cf79dca46abad0f60
2021-01-12 02:21:57 +00:00
Remi NGUYEN VAN
2812f607a0
Revert^2 "Add service-connectivity to tethering APEX"
...
Add the connectivity service JAR to the tethering APEX.
This change should not be released in monthly updates until the
modularization work is done, so will be reverted in module release
branches.
This rolls forward the change. The original topic was reverted because
of a bad merged-in clause; this is fixed and re-verified in this topic.
Test: Boot, wifi connects and has internet access
Bug: 171540887
Change-Id: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-01-08 01:24:36 +00:00
Treehugger Robot
42e3663c76
Merge "Revert "Add service-connectivity to tethering APEX"" am: 4f430ae5ec am: 67650555b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1541543
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I77fdad4bf192ba260118f6ef2b7c2fd0b2ae3b3d
2021-01-07 18:48:00 +00:00
Pete Bentley
850ca6f6b4
Revert "Add service-connectivity to tethering APEX"
...
Revert "Set setCurrentProxyScriptUrl as public"
Revert submission 1532910-connectivity_jar_in_apex
Reason for revert: Breaks boot tests: b/176969905
Reverted Changes:
Ie41a5b569:Set setCurrentProxyScriptUrl as public
Id7b6a4664:Move service-connectivity to the tethering APEX
Ia7cb83834:Add service-connectivity to tethering APEX
Change-Id: I9f31d4810a92e620f02cc8d24bdf18fe28001a2b
2021-01-07 13:51:18 +00:00
Lorenzo Colitti
4b2bf51ef9
Merge "Add service-connectivity to tethering APEX" am: 7998551cdc am: 3ebe8d0394
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488520
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5f1f8a73b73277709568a79b623fa88f13b95179
2021-01-07 09:49:41 +00:00
Remi NGUYEN VAN
bd5cc4231d
Add service-connectivity to tethering APEX
...
Add the connectivity service JAR to the tethering APEX.
This change should not be released in monthly updates until the
modularization work is done, so will be reverted in module release
branches.
Test: Boot, wifi connects and has internet access
Bug: 171540887
Merged-In: Ic496cd62be8c90928ccc619519ebe517beea78f0
Change-Id: Ia7cb83834b854e8c495c4ef17ec69ad032509208
2021-01-07 06:17:33 +00:00
Nikita Ioffe
b6313e4e2c
Merge "com.android.tethering: set min_sdk_version 30" am: 06bf173b20 am: b2bfb81567
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489717
Change-Id: I8ff9ecaa92dbbf39659211b05ef9469c25909e12
2020-11-09 06:06:37 +00:00
Nikita Ioffe
583e35a12e
com.android.tethering: set min_sdk_version 30
...
Tethering is updatable apex module that was launched in R, hence it and
all it dependencies should specify min_sdk_version <= 30.
Test: m
Bug: 171668006
Bug: 171330443
Change-Id: Ic91cf96dda6419d1038b0329b920f9cd24482aef
Merged-In: Ic91cf96dda6419d1038b0329b920f9cd24482aef
(cherry picked from commit bee20e84f8 )
(cherry picked from commit 1fe1e539e1 )
2020-11-05 20:30:40 +00:00
markchien
0582605da7
Bump Tethering apex version code
...
The version code in the manifest is only used for development
builds, as release builds dynamically replace it.
Bug: 170183552
Test: m
Change-Id: I51916756f41672d372e3a4adce3a8edf5d472c0d
2020-10-22 06:49:24 +00:00
Nucca Chen
b463014633
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: Ic90ce1bc5a5abd1eb515e5392b2980cdd001dc9f
2020-09-18 04:56:57 +00:00
Nucca Chen
a0d6f9712b
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: Ia0b8a185f44dac7db365fcb9fc865a82bd552d62
2020-09-18 04:27:28 +00:00
Hungming Chen
56c632caed
Move BPF offload program from netd to mainline
...
Test: as the follows.
$ adb shell ls sys/fs/bpf | grep offload
map_offload_tether_ingress_map
map_offload_tether_limit_map
map_offload_tether_stats_map
prog_offload_schedcls_ingress_tether_ether
prog_offload_schedcls_ingress_tether_rawip
$ adb shell dumpsys netd --short
TetherController
BPF ingress map: iif(iface) v6addr -> oif(iface) srcmac ..
13(rmnet_data3) 2401:e180:8842:6e3:bc6a:2e45:c30:f418 -> ..
BPF stats (downlink): iif(iface) -> packets bytes errors
13(rmnet_data3) -> 7 488 0
BPF limit: iif(iface) -> bytes
13(rmnet_data3) -> 9223372036854775807
Log:
bpfloader: Loaded object: /apex/com.android.tethering/etc/bpf/offload.o
Change-Id: I71b7efb1f4bd6eb1cd469a0e1e4a56342dc6e579
2020-09-16 20:38:14 +08:00
android-build-team Robot
8e291dea63
Make change and version bump to r_aml_300900700 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ieed62e845451de7c90a0f71a21289003e5ea8b72
2020-07-09 03:16:41 +00:00
android-build-team Robot
0076305369
Make change and version bump to r_aml_300900600 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Idac701bf872c3e7d5b854c6a19ca0da5d01d6699
2020-07-08 03:17:08 +00:00
android-build-team Robot
ce11e33b62
Make change and version bump to r_aml_300900500 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I7daf3a7b2989105022a05e6b3c7d3fdbe165baed
2020-07-07 03:16:56 +00:00
android-build-team Robot
37718b7db0
Make change and version bump to r_aml_300900400 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I538efbc8e379b929f50ad1762bdf759ca31cdbb8
2020-07-06 03:16:59 +00:00
android-build-team Robot
806c971702
Make change and version bump to r_aml_300900300 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ic95844fa021e178f665d3cc74e795e510cee29db
2020-07-04 03:16:40 +00:00
android-build-team Robot
5761320c2f
Make change and version bump to r_aml_300900200 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ic32f7f6c83b8bc61d3ef93c03857ea205c6b0dbe
2020-07-03 03:17:10 +00:00
android-build-team Robot
1a727e2525
Make change and version bump to r_aml_300900100 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I182d7ddf35e0684e7b6cb54fed43662a26a9d3dd
2020-07-02 03:16:45 +00:00
android-build-team Robot
82a04d4597
Make change and version bump to r_aml_300900000 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: If7bac499f32dabcb20f7482ac9e40bb73cd785db
2020-07-01 03:16:47 +00:00
Akshay Thakker
e0e3176269
Make change and version bump to r_aml_309999900 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I0a80cda2e4a62ccd87e4fbbe1faa6d6fdb23f014
Exempt-From-Owner-Approval: Version bump only
2020-06-30 05:26:30 +00:00
android-build-team Robot
413f0d0164
Make change and version bump to r_aml_300803100 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ic3a9e3a3345dac2b176f71c81b9a274ae650289b
2020-06-30 03:16:48 +00:00
android-build-team Robot
03b503b7b5
Make change and version bump to r_aml_300803000 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I7a94ebf72bee6df80732d20b68e16cfbf1b65018
2020-06-29 03:17:28 +00:00
android-build-team Robot
72e8ef38f7
Make change and version bump to r_aml_300802900 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Iff018565791817468a1103fbaee0ba638b89fb65
2020-06-27 03:31:45 +00:00
android-build-team Robot
5abec93060
Make change and version bump to r_aml_300802800 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I6198d9fb4577b6355f746e9a7ede6d07469a1556
2020-06-26 03:16:35 +00:00
android-build-team Robot
c7d753e3e2
Make change and version bump to r_aml_300802700 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I7670710e4da2f340a3fb02c3b3b3373c36adf3e7
2020-06-25 03:21:35 +00:00
android-build-team Robot
7bb96e0987
Make change and version bump to r_aml_300802600 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I1fec7c5e3e3222df6ccd9b3c00d03b59178388b5
2020-06-24 16:55:08 +00:00
android-build-team Robot
8625f51f83
Make change and version bump to r_aml_300802500 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I679f091959d2cc72015bde3fa0bb2f6b7bd5d074
2020-06-24 03:17:28 +00:00
android-build-team Robot
67d9d012b6
Make change and version bump to r_aml_300802400 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: If743b76583bc895f11674e468792c0da1b958121
2020-06-23 03:17:14 +00:00
android-build-team Robot
75c7ca2283
Make change and version bump to r_aml_300802300 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ie54721e710eda02bda97af622520078fca01d632
2020-06-22 03:17:06 +00:00
android-build-team Robot
8997b6c8e1
Make change and version bump to r_aml_300802200 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ibddfd670698e66c42797c61e7020c1382fecb2bf
2020-06-20 03:22:10 +00:00
android-build-team Robot
1a09018e55
Make change and version bump to r_aml_300802100 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I7af1c3a55b61516884940432f9146eb26c169668
2020-06-19 07:17:59 +00:00
android-build-team Robot
2f8db2964d
Make change and version bump to r_aml_300802000 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I6601ad32346eec33bef7dde00ae7d744c86aa8e4
2020-06-18 07:17:34 +00:00
android-build-team Robot
fad40ff9e9
Make change and version bump to r_aml_300801900 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I357be5bdb76f6276711e39743d88974b7d1cf248
2020-06-17 19:58:05 +00:00
android-build-team Robot
51fc9bad09
Make change and version bump to r_aml_300801800 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I86d41b911e1b337ff794f3f2d636661ce7427985
2020-06-17 07:19:12 +00:00
android-build-team Robot
f90328dd70
Make change and version bump to r_aml_300801700 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ie3a0a9efb7b092ee585abb28e50502077e44ee3e
2020-06-16 07:16:41 +00:00
android-build-team Robot
3a24b176e7
Make change and version bump to r_aml_300801600 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ia1f7a301c15fddbaa0009e2106b95e4b0a76b329
2020-06-15 07:16:48 +00:00
android-build-team Robot
c77a1e9e52
Make change and version bump to r_aml_300801500 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I75d67291909ddeb356f2927c4e11c2981ebeff37
2020-06-14 07:21:49 +00:00
android-build-team Robot
0b741e482c
Make change and version bump to r_aml_300801400 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I9c9f527416459b38c32ccf5b65f4054cea5b586f
2020-06-12 07:21:50 +00:00
android-build-team Robot
54bb5f39ae
Make change and version bump to r_aml_300801300 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ia261164ce399e211f9136fa36b6d28f9aea918d1
2020-06-11 07:16:12 +00:00
android-build-team Robot
1fbd32ecd5
Make change and version bump to r_aml_300801200 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: Ib12acc94b460b14aa189a97511df0f1138e47484
2020-06-10 07:17:04 +00:00
android-build-team Robot
14adb0af6b
Make change and version bump to r_aml_300801100 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I06126d269aa431f5c9f6cd38f403ddfd3f12d489
2020-06-09 07:17:51 +00:00
android-build-team Robot
d32a0a526c
Make change and version bump to r_aml_300801000 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: If733150c77381e8c826f701ef4d27f78673db9f6
2020-06-08 07:16:52 +00:00
android-build-team Robot
827fe24443
Make change and version bump to r_aml_300800800 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I828035d23d7d91026b9e62fb735b0f17683c7ee5
2020-06-07 07:17:43 +00:00
android-build-team Robot
af09da3163
Make change and version bump to r_aml_300800500 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I3fa94cc97b8b3403942d23433da6583e355fba34
2020-06-05 16:31:31 +00:00
android-build-team Robot
81da6d2f86
Make change and version bump to r_aml_300800400 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I4cd619ef5fd16fe08ac9b5aca5602fe5538cdfaf
2020-06-05 07:31:45 +00:00
android-build-team Robot
531bcdeae1
Make change and version bump to r_aml_300800200 for mainline module file: packages/Tethering/apex/manifest.json
...
Change-Id: I265ac5f72edf4fdb396ed00c7db5d30d21706f6e
2020-06-04 21:53:22 +00:00
Jooyung Han
5f9f31c18b
Set min_sdk_version for updatable mainline modules
...
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.
For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.
Bug: 145796956
Bug: 150999716
Test: m
Merged-In: Ifaecb49a47a1f43edea3ea06e1cf704a177d1044
Change-Id: Ifaecb49a47a1f43edea3ea06e1cf704a177d1044
(cherry picked from commit 33aa294e96f13906f596e427b96652fe80cf199b)
2020-05-13 16:18:51 +09:00
Jooyung Han
669772eb76
Merge "Set min_sdk_version for updatable mainline modules" am: 50f4887299 am: e25536866e
...
Change-Id: I3152d9e94e0a1fce02ecb16b3ec0cea92c856ebe
2020-05-08 09:40:48 +00:00