Nucca Chen
952cf756f8
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b am: b463014633 am: 4286c98bb1 am: 9b597de75b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: I6e4c56e3d7b411cbe5a18af02fb076fc457f203a
2020-09-18 06:50:05 +00:00
Nucca Chen
9b597de75b
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b am: b463014633 am: 4286c98bb1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: I476365339384f18bf1e5b3d1509d92d3380fbe35
2020-09-18 06:12:50 +00:00
Nucca Chen
4286c98bb1
Merge "Move BPF offload program from netd to mainline" am: c26848e7bd am: a0d6f9712b am: b463014633
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424189
Change-Id: I248a1e3d9aad6a1f632898faa59953f29ba14f5f
2020-09-18 05:36:25 +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
Anton Hansson
81d1fd3c86
[automerger skipped] Merge "Simplify module visibility post build refactor" into mainline-prod am: f26c330295 -s ours
...
am skip reason: Change-Id Ibf35bfac5c99a21125f89ba10945f3364217b90f with SHA-1 9aed13818c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12559475
Change-Id: I8acb421d671287e193d5d462788b3342ed193131
2020-09-17 01:47:44 +00:00
Makoto Onuki
0d642eba0c
[automerger skipped] Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" into mainline-prod am: 8e29b7caee -s ours
...
am skip reason: Change-Id Ie1ad6711c490c679ebcfacd97154380a8810ba1c with SHA-1 7197b67343 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12558117
Change-Id: I16620dd56e687da1a6230bb3ed7512b798822b8c
2020-09-16 19:08:42 +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
Bill Yi
8c86a215ae
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38436142ff -s ours am: 509872d525 -s ours am: ebe91344a0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I1713ac8976730a0e6a414cf0e761f7f0267cf51e
2020-09-15 20:32:15 +00:00
Bill Yi
ebe91344a0
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38436142ff -s ours am: 509872d525 -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I36d5555b5fa23140e4916f568353af25b579c653
2020-09-14 22:20:16 +00:00
Bill Yi
509872d525
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: 38436142ff -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb
2020-09-14 21:50:56 +00:00
Bill Yi
38436142ff
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours
...
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741
Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
2020-09-14 21:18:54 +00:00
Anton Hansson
f26c330295
Merge "Simplify module visibility post build refactor" into mainline-prod
2020-09-14 14:14:15 +00:00
Bill Yi
8780ad918d
Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732
2020-09-13 07:58:42 -07:00
Xin Li
90eabb1afb
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: b7fcf57c8d -s ours am: d0d979b032 -s ours am: c20bf732b1 -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Iaa8c8357dffc8b79db12607cf6bf182ed6a62e74
2020-09-11 21:27:28 +00:00
Makoto Onuki
3ef6c1ef26
Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs
...
Exempt-From-Owner-Approval: Cherry-picking from master
Test: build / treehugger
Bug: 146727827
Change-Id: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
Merged-in: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
2020-09-11 15:34:15 +00:00
Anton Hansson
ddaad5c538
Simplify module visibility post build refactor
...
//visibility:override is no longer needed for impl_library_visibility
to override visibility.
Removing this allows the defaults module to specify better defaults.
- Stub libraries are made publicly visible, via `visibility`
- Impl libraries are private by default, but visibility is extended
by the modules
Bug: 165017290
Test: m
Exempt-From-Owner-Approval: build refactor
Change-Id: Ibf35bfac5c99a21125f89ba10945f3364217b90f
Merged-In: Ibf35bfac5c99a21125f89ba10945f3364217b90f
(cherry picked from commit 9aed13818c )
2020-09-11 13:21:32 +01:00
Xin Li
c20bf732b1
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: b7fcf57c8d -s ours am: d0d979b032 -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: I47087cabc2093c6de6116f11f660aa624dcb260e
2020-09-11 03:58:59 +00:00
Xin Li
d0d979b032
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: b7fcf57c8d -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae
2020-09-11 03:33:28 +00:00
Xin Li
b7fcf57c8d
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours
...
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395
Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6
2020-09-11 02:02:37 +00:00
Anton Hansson
5aa8e25cdd
Merge mainline-prod into master
...
$ git merge -s ours origin/mainline-prod
There are only two commits not from upstream:
a732b3a5a2
1be2664406a2e697044f483a44c547973f915e3d
But both of these are noops in master (due to Merged-In).
Bug: 168176832
Test: presubmit
Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705
2020-09-10 08:18:00 +00:00
Xin Li
3b8bfc4811
Merge Android R
...
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
2020-09-09 20:21:10 -07:00
Anton Hansson
7299c8ba41
Merge "Simplify module visibility post build refactor" into stage-aosp-master am: f94c8eb54f am: 6ab81ec60a am: 4900454137 am: 743fd239c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513172
Change-Id: I17a53b8879902fdf66f434b3115391a79c8d95dd
2020-09-07 09:31:51 +00:00
Anton Hansson
743fd239c9
Merge "Simplify module visibility post build refactor" into stage-aosp-master am: f94c8eb54f am: 6ab81ec60a am: 4900454137
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513172
Change-Id: I8934625a2356f7cf7769d8685e0c8e08a22be292
2020-09-07 09:16:39 +00:00
Anton Hansson
4900454137
Merge "Simplify module visibility post build refactor" into stage-aosp-master am: f94c8eb54f am: 6ab81ec60a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513172
Change-Id: Ibdfa0189a9b7608dfcfe3a40ed3fd84150372c19
2020-09-07 09:02:10 +00:00
Anton Hansson
6ab81ec60a
Merge "Simplify module visibility post build refactor" into stage-aosp-master am: f94c8eb54f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513172
Change-Id: Iff37388324c3fb1e838c3c7ffc803b96d6e61197
2020-09-07 08:22:05 +00:00
Anton Hansson
f94c8eb54f
Merge "Simplify module visibility post build refactor" into stage-aosp-master
2020-09-07 08:09:53 +00:00
Anton Hansson
9aed13818c
Simplify module visibility post build refactor
...
//visibility:override is no longer needed for impl_library_visibility
to override visibility.
Removing this allows the defaults module to specify better defaults.
- Stub libraries are made publicly visible, via `visibility`
- Impl libraries are private by default, but visibility is extended
by the modules
Bug: 165017290
Test: m
Exempt-From-Owner-Approval: build refactor
Change-Id: Ibf35bfac5c99a21125f89ba10945f3364217b90f
2020-09-07 07:54:50 +00:00
Treehugger Robot
996d53d15e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours am: 097abd5f98 -s ours am: c6ac3642f3 -s ours am: 539f9c66da -s ours am: c83088774c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007
Change-Id: Icc2f248067d04527e9625f48e8aeb7ac0fed6c5f
2020-09-06 07:49:53 +00:00
Treehugger Robot
c83088774c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours am: 097abd5f98 -s ours am: c6ac3642f3 -s ours am: 539f9c66da -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007
Change-Id: I3ec579c9c49125ef9ac8436e37b56d3cf40a427a
2020-09-06 07:26:24 +00:00
Treehugger Robot
539f9c66da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours am: 097abd5f98 -s ours am: c6ac3642f3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007
Change-Id: I6a579c24192f0b36ea79732560f39684d27a1c90
2020-09-06 07:11:17 +00:00
Treehugger Robot
c6ac3642f3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours am: 097abd5f98 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007
Change-Id: I7815cf85faa06b0331044e5b4ffd2561d2ec97c1
2020-09-06 06:49:13 +00:00
Treehugger Robot
097abd5f98
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5db7c0028c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420007
Change-Id: I9102a96a0cb816b895ccf93a174dc6e91e59ee5a
2020-09-06 06:40:58 +00:00
Treehugger Robot
5db7c0028c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2020-09-06 06:27:36 +00:00
Bill Yi
2adde431b6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I729ec6ac98a95690838697c28220b11b0f1b0399
2020-09-05 21:39:23 -07:00
Treehugger Robot
1fd9f3a85b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 44d4d1333c -s ours am: 7243e173c1 -s ours am: dc54ae3488 -s ours am: 9ebff03fbd -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263
Change-Id: I2b203fe66a595135f5c4b82e4e47e6a2300f62f4
2020-09-05 05:57:27 +00:00
Treehugger Robot
9ebff03fbd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 44d4d1333c -s ours am: 7243e173c1 -s ours am: dc54ae3488 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263
Change-Id: Iad566310602f142a484e2cf747baf0dc046bc4f5
2020-09-05 05:49:20 +00:00
Treehugger Robot
dc54ae3488
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 44d4d1333c -s ours am: 7243e173c1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263
Change-Id: I191ef5c7773eff3dbdadf2937476c3d6c0bb1995
2020-09-05 05:40:07 +00:00
Treehugger Robot
7243e173c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 44d4d1333c -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263
Change-Id: Icd0d9a7683326f0f5c5230ccceeededd4afce81a
2020-09-05 05:27:36 +00:00
Treehugger Robot
44d4d1333c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263
Change-Id: I65af634549f635e7acf2a1b88213500081d8fde2
2020-09-05 04:33:51 +00:00
Bill Yi
6c701f5341
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibfe7031a80e38ed3fe776e195514e6c7cad418ab
2020-09-05 01:14:22 +00:00
Automerger Merge Worker
dec7d79809
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours" into rvc-dev-plus-aosp am: e4d619fc77 -s ours am: e1ac7346f1 -s ours am: 80f5ac3388 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I6e10d2f36c707ef0438e673a027d9a38768097d2
2020-09-03 16:40:51 +00:00
TreeHugger Robot
b03fe73809
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours am: e895502223 -s ours am: 9755660115 -s ours am: 69227f0bfa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I1a9fe4f839f9e49b613ab3f4814620793d0db5d9
2020-09-03 16:40:26 +00:00
Automerger Merge Worker
80f5ac3388
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours" into rvc-dev-plus-aosp am: e4d619fc77 -s ours am: e1ac7346f1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: If335fb0237a1c82b821040f3c9c876701fb14594
2020-09-03 16:12:12 +00:00
TreeHugger Robot
69227f0bfa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours am: e895502223 -s ours am: 9755660115 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: Ifc747069b8f3a643bec3b9035eb9545d11b4379b
2020-09-03 16:11:54 +00:00
Automerger Merge Worker
e1ac7346f1
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours" into rvc-dev-plus-aosp am: e4d619fc77 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: Ia9bf530f1374ad90b35b2987eafa37b05bb27158
2020-09-03 15:42:11 +00:00
TreeHugger Robot
9755660115
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours am: e895502223 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I572304d0a513ab314282b54f282c359ddbf5beb9
2020-09-03 15:41:41 +00:00
Automerger Merge Worker
e4d619fc77
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours" into rvc-dev-plus-aosp
2020-09-03 15:27:39 +00:00
TreeHugger Robot
fa057a2054
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I8d402d836fbfd2090ef839420de9b35f2e6b873c
2020-09-03 15:27:28 +00:00
TreeHugger Robot
e895502223
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I2afceeedf1a90fc10c981a4d139004ce5f237030
2020-09-03 15:27:07 +00:00