Merge "Update hidden API files for EthernetManager API move." into tm-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2022-03-15 10:22:28 +00:00
8007fbbfb9
Merge changes I5af6ce96,Ibc1f6813 am: 3938102448 am: a7033ddecf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941933
Change-Id: Idcd5873236e7483786482ee0e3e234071685e0de
Nucca Chen
authored and
Automerger Merge Worker
commited 2022-03-11 18:47:24 +00:00
c7b499505a
Merge changes I5af6ce96,Ibc1f6813 am: 3938102448
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941933
Change-Id: I387852c0c1d451f0308bfd1cf683c80eae897efe
Nucca Chen
authored and
Automerger Merge Worker
commited 2022-03-11 18:26:04 +00:00
a7033ddecf
Merge changes I5af6ce96,Ibc1f6813
...
* changes:
Refactor make{Tether4Key, Tether4Value ConntrackEvent} helper
BpfCoordinatorTest: refactor upstream and downstream setup functions
Nucca Chen
authored and
Gerrit Code Review
commited 2022-03-11 18:05:14 +00:00
3938102448
Merge "Use U32 from shared library" am: 98502b78bc am: c70b60c35e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952114
Change-Id: I507992b0da0a6177ce62c76c31919770d37d9e60
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-10 17:23:14 +00:00
7180050d29
Merge "Use U32 from shared library" am: 98502b78bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952114
Change-Id: I7528dae94801d7cddee03595d2b76904fa8afed3
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-10 16:49:14 +00:00
c70b60c35e
Merge "Use U32 from shared library"
Mark Chien
authored and
Gerrit Code Review
commited 2022-03-10 16:27:33 +00:00
98502b78bc
Update hidden API files for EthernetManager API move.
...
Test: m
Bug: 210586283
Ignore-AOSP-First: avoid merge conflicts
Change-Id: I995c81f9bcfdd57c37f679878b6973d3de739803
Xiao Ma
commited 2022-03-10 20:58:35 +09:00
f5883e3686
Use U32 from shared library
...
There is U32 added in frameworks/libs/net. Use shared one to avoid
duplicated code.
Bug: 215095957
Test: m
Change-Id: I861bc2f65ea947a908de2ec83e9b137d3342c8ce
markchien
commited 2022-03-09 15:05:16 +08:00
22c1a3aa1f
[Resolved conflict] Merge "Merge Android 12L" am: e6953d54a5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2013399
Ignore-AOSP-First: automerger CL from AOSP
Change-Id: Ib5909fcd5078da0beaf399695bc25b28c4eb7918
Xin Li
commited 2022-03-08 17:13:34 +00:00
dc0aa2e9bf
Merge "Using common apex_defaults for com.android.tethering module." am: 6802eadef5 am: 36996876b0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2007756
Change-Id: If7b94aa11b4c9e905aa6ab52559057b984da5f51
Gurpreet Singh
authored and
Automerger Merge Worker
commited 2022-03-07 18:33:15 +00:00
e05b5222af
Merge "Using common apex_defaults for com.android.tethering module." am: 6802eadef5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2007756
Change-Id: I2ff4e2d44bc8787c9a07027147d1adea1df4c1b4
Gurpreet Singh
authored and
Automerger Merge Worker
commited 2022-03-07 17:57:46 +00:00
36996876b0
Merge "Using common apex_defaults for com.android.tethering module." am: 6802eadef5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2007756
Change-Id: I03636e6b8b4dc200fcb039b99190759bc7d5e776
Gurpreet Singh
authored and
Automerger Merge Worker
commited 2022-03-07 17:56:53 +00:00
3acad24476
Merge "Using common apex_defaults for com.android.tethering module."
Gurpreet Singh
authored and
Gerrit Code Review
commited 2022-03-07 17:32:37 +00:00
6802eadef5
Merge "Make isTetheringSupported respect all tethering downstreams" am: 8dcc3000fd am: ed061b1e09
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938694
Change-Id: Idf9865302881522eb26c385acf0cb2a6198ef539
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-07 06:40:00 +00:00
bc79108b69
Merge "Make isTetheringSupported respect all tethering downstreams" am: 8dcc3000fd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938694
Change-Id: I2f4e154291d9af8971ad0ba518935e379ebac4d3
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-07 06:18:47 +00:00
ed061b1e09
Merge "Make isTetheringSupported respect all tethering downstreams" am: 8dcc3000fd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1938694
Change-Id: Ic5f106a611a729fd63af2710bb9354be447641fd
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-07 06:17:57 +00:00
c4b5faefaf
Merge "Make isTetheringSupported respect all tethering downstreams"
Mark Chien
authored and
Gerrit Code Review
commited 2022-03-07 05:56:20 +00:00
8dcc3000fd
Make isTetheringSupported respect all tethering downstreams
...
Currently if wifi, usb and bluetooth tethering is not supported,
isTetheringSupported would return false. Then ethernet, ncm tethering
and wifi p2p would also not be supported anymore. Make
isTetheringSupported respect all tethering downstreams after T.
Also remove redundant code:
1. tethering always has upstream configuration, checking whether has
upstream configuration for isTetheringSupported is useless.
2. Remove TetheringDependencies#isTetheringSupported because it don't
have any caller.
Test: atest TetheringTests
Change-Id: I3db5ce410c064d37c9e9e704fce2a2b68705834e
markchien
commited 2022-03-07 10:55:51 +08:00
259d5c08a8
Deduplicate InterfaceParams am: 9f371f024b am: c75bd90328
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2006832
Change-Id: Idd68a0b18009b923b95cf661f2c49230ef349022
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-03-05 09:11:47 +00:00
6c3c538632
Merge changes from topic "dedup-interfaceparams" am: a63535bfd1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2007154
Change-Id: I7bd8c3a2ef89d0f358d6002d87dd08d6cd818691
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-03-05 08:50:34 +00:00
ef0b4884d0
Deduplicate InterfaceParams am: 9f371f024b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2006832
Change-Id: I5d0139ca8c4a92b7e20c0e5d051ce78920f236a0
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-03-05 08:50:09 +00:00
c75bd90328
Merge changes from topic "dedup-interfaceparams"
...
* changes:
Remove unused InterfaceParams jarjar rule
Deduplicate InterfaceParams
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-03-05 08:23:55 +00:00
a63535bfd1
Deduplicate InterfaceParams
...
CS should use InterfaceParams from frameworks/libs/net.
Test: builds
Bug: 222448728
Change-Id: I1f45d3171b265461a8724b4be7b212c030b63fe9
Patrick Rohr
commited 2022-03-04 16:53:51 +01:00
9f371f024b
Using common apex_defaults for com.android.tethering module.
...
In /packages/modules/common/sdk/ModuleDefaults.bp file, some
apex_defaults are added to provide common parameters corresponding to
Q, R, S, and T releases.
(Refer to CL link for above mentioned change -
https://android-review.googlesource.com/c/platform/packages/modules/common/+/2005890?forceReload=true )
This CL is using the apex_default corresponding to R release for the
com.google.android.tethering module.
Bug: 172589606
Test: USE_RBE=true m
Since there are no runtime changes, successful code build is enough for
testing.
Change-Id: I4b3b3d6add96da1ee4421227996b54f7b96bc2c2
Gurpreet Singh
commited 2022-03-04 15:34:29 +00:00
a12858d494
Merge "Pass whole TetheringConfiguration to IpServer" am: 9edd999725 am: f815abc7ac
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999083
Change-Id: Ia6f4c5ca684ea8c42854af0756e391288c3873f6
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-03 12:44:40 +00:00
c33bce2bc3
Merge "Pass whole TetheringConfiguration to IpServer" am: 9edd999725
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999083
Change-Id: I79e2d5d822703902d35d8963bf32edc1ad2f3e26
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-03 12:20:54 +00:00
9024fe85bd
Merge "Pass whole TetheringConfiguration to IpServer" am: 9edd999725
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999083
Change-Id: Icbef216a9f4fb11a7bc271c6d75c9a9b5780e81d
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-03 12:20:33 +00:00
f815abc7ac
Merge "Pass whole TetheringConfiguration to IpServer"
Mark Chien
authored and
Gerrit Code Review
commited 2022-03-03 11:54:59 +00:00
9edd999725
Pass whole TetheringConfiguration to IpServer
...
This is a no-op CL that passing whole TetheringConfiguration to IpServer
to reduce the number of IpServer constructor parameters.
Bug: 170056953
Test: atest TetheringTests
Change-Id: I4ec17f7ecaefd7f275139ad9c7f7551635b192c9
markchien
authored and
Mark Chien
commited 2022-03-03 11:54:24 +00:00
b961d3d70f
Merge "Remove tether_enable_select_all_prefix_ranges flag" am: a3728e97ca am: 0438fbe9ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005315
Change-Id: I70da2fa5f7b4b55a8843e4b4c450e8ac7f12774c
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-03 10:31:29 +00:00
d5740854f2
Merge "Remove tether_enable_select_all_prefix_ranges flag" am: a3728e97ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005315
Change-Id: I34f748e1fdbc1c8ec82dfce4053e12989a99cad2
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-03 10:08:41 +00:00
38bfe95387
Merge "Remove tether_enable_select_all_prefix_ranges flag" am: a3728e97ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005315
Change-Id: Id8bae1a73c9c7fd976f872e809ca9d524fa2c2b4
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-03 10:08:04 +00:00
0438fbe9ee
Merge "Remove tether_enable_select_all_prefix_ranges flag"
Mark Chien
authored and
Gerrit Code Review
commited 2022-03-03 09:40:27 +00:00
a3728e97ca
Remove tether_enable_select_all_prefix_ranges flag
...
The tether_enable_select_all_prefix_ranges is added from M2020-12
for quick roll back the feature. Since feature is landed over a year
without any problem, remove the flag now.
Bug: 171269957
Test: atest TetheringTests
Change-Id: I3ef414a47dd0a1f80ea2d378601ccd7c14067318
markchien
commited 2022-03-02 21:58:50 +08:00
23a5f18adb
Merge "Rename framework-connectivity-tiramisu to framework-connectivity-t" am: c871c08d8d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976727
Change-Id: I1d69a7e13408a2d3bf61250b6568ea522b27880c
Paul Hu
authored and
Automerger Merge Worker
commited 2022-03-02 07:27:24 +00:00
e435b5b513
DO NOT MERGE: Rename framework-connectivity-tiramisu on buildstubs-t & Tethering/apex
...
Bug: 215434166
Ignore-AOSP-First: This is to avoid merge conflicts when merging in AOSP
Test: build, flash, device boot to home.
Change-Id: Idb4e1efd6cc306f0109951048c77e897789d3bf8
paulhu
authored and
Paul Hu
commited 2022-03-01 05:55:33 +00:00
9211a8fc38
Rename framework-connectivity-tiramisu to framework-connectivity-t
...
Note: There is a difference on Tethering/apex/Android.bp because
framework-connectivity-tiramisu has been marked on
bootclasspath_fragment.
Bug: 215434166
Ignore-AOSP-First: Merge conflict. Will cherry-pick to AOSP afterwards.
Test: build, flash, device boot to home.
Merged-In: I9ebedf8813cbfa30d979bc35a3b2306715be682b
Change-Id: I9ebedf8813cbfa30d979bc35a3b2306715be682b
(cherry picked from commit 1d87cbdc88 )
paulhu
authored and
Paul Hu
commited 2022-03-01 03:10:41 +00:00
e8054a8ad1
Rename framework-connectivity-tiramisu to framework-connectivity-t
...
Bug: 215434166
Test: build, flash, device boot to home.
Merged-In: I9ebedf8813cbfa30d979bc35a3b2306715be682b
Change-Id: I9ebedf8813cbfa30d979bc35a3b2306715be682b
paulhu
commited 2022-03-01 09:44:21 +08:00
537f72061a
Add JNI stats libraries to apex Android.bp am: 6187e7c79a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1994130
Change-Id: Ib5f5984dad0c1316a6845e03fc5bf9bb1e6d023a
junyulai
authored and
Automerger Merge Worker
commited 2022-02-28 06:26:47 +00:00
47bdefd82b
[MS54.8] Add hiddenapi-unsupported-t.txt to apex Android.bp am: 4eccfdec89
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999073
Change-Id: If7ec922ee50497ef2e8c4230fda574f93f61c6d4
junyulai
authored and
Automerger Merge Worker
commited 2022-02-28 06:26:40 +00:00
be96c01931
[MS54.3] Move NetworkStats to updatable sources am: eb6f4bef96
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987447
Change-Id: I5c527290654b76405776efd54e57a1b469c62add
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-02-28 06:26:36 +00:00
2eea4e4bd0
[MS54.3] Move NetworkStats to updatable sources am: eb6f4bef96
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987447
Change-Id: I902a20e0c2304cae6e57a32c5b33403245116f7f
Junyu Lai
authored and
Automerger Merge Worker
commited 2022-02-28 06:08:37 +00:00
0a7c4c5659
Merge changes from topic "ms52-movenetstats"
...
* changes:
Update API files to unhide MATCH_PROXY.
Update tests for NetworkStats code move.
Add setPollForce to module API
Add JNI stats libraries to apex Android.bp
Add JNI stats libraries to connectivity
[MS62.2] Add NetworkStatsService into service initializer
[MS54.8] Add hiddenapi-unsupported-t.txt to apex Android.bp
[MS54.3] Move NetworkStats to updatable sources
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2022-02-28 05:32:23 +00:00
cebdfba1bb
Add JNI stats libraries to apex Android.bp
...
This is separated from ag/16766427 to avoid merge
conflict at downstream branches. For some downstream branches,
the library does not exist and this part is commented out.
Bug: 197717846
Test: atest FrameworksNetTests
Merged-In: Idb6da7ce678fbb3f4839604726cbdbdf223144c1
Merged-In: Iae44344701a3267110e5cbf271120201134d59e5
Change-Id: I9d7f6cea1cdb3c8117e677d8c204e3985295ada0
junyulai
authored and
Junyu Lai
commited 2022-02-28 04:16:58 +00:00
6187e7c79a
[MS54.8] Add hiddenapi-unsupported-t.txt to apex Android.bp
...
This is separated from ag/16657723 to avoid merge
conflict at downstream branches. For some downstream branches,
the library does not exist and this part is commented out.
Test: TH
Bug: 197717846
Merged-In: I4eeb7ea9cfc3139991caf0fc22474e0052a0391c
Merged-In: I33e0d699086c87ce8e940036c9a52908bbbcf6c5
Change-Id: I031e5687fa47594b50ca1b40570e01cdec356827
junyulai
authored and
Junyu Lai
commited 2022-02-28 04:15:51 +00:00
4eccfdec89
[MS54.3] Move NetworkStats to updatable sources
...
This CL builds NetworkStats related codes with the
connectivity module instead of platform.
Test: TH
Bug: 197717846
Change-Id: I4eeb7ea9cfc3139991caf0fc22474e0052a0391c
Merged-In: I4eeb7ea9cfc3139991caf0fc22474e0052a0391c
Junyu Lai
commited 2022-02-28 03:24:19 +00:00
eb6f4bef96
Merge "Notify linkproperties change in all scenarios" am: cc0dc24205 am: 96fe87ceae
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958901
Change-Id: Iffd52a9e415dc72bc58c9db15c2627bfa182bb12
Mark Chien
authored and
Automerger Merge Worker
commited 2022-02-25 12:02:32 +00:00
5cc8c767ee
Merge "Notify linkproperties change in all scenarios" am: cc0dc24205
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958901
Change-Id: I4f3a6f539f6d38552304c1300ce9b21a115234da
Mark Chien
authored and
Automerger Merge Worker
commited 2022-02-25 11:38:37 +00:00
3e834ca21f
Merge "Notify linkproperties change in all scenarios" am: cc0dc24205
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958901
Change-Id: I537bdbe6d4f42ddb1b437b432c1d4c4ead143e05
Mark Chien
authored and
Automerger Merge Worker
commited 2022-02-25 11:38:25 +00:00
96fe87ceae