summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-13Snap for 7080270 from 98192ea17e895ff6f83b901bf830e4f131028cd9 to ↵android-mainline-12.0.0_r55android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r45android-mainline-11.0.0_r33android-mainline-11.0.0_r10android11-mainline-releaseandroid-build-team Robot
mainline-release Change-Id: Ib3f873e9b44ba511815bfcf39a14958b6d25a8a7
2021-01-13Merge "[NS01.5] Fix an embarrassing bug" am: b9eacc495e am: 77228fad66Chalard Jean
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1549479 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia7a3645f0f97d6516075cdbba6bc288d04a6e1e0
2021-01-13Merge "[NS01.5] Fix an embarrassing bug" am: b9eacc495eChalard Jean
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1549479 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If8370b069c6f5d9e1d77896981281c893b4bf828
2021-01-13Merge "[NS01.5] Fix an embarrassing bug"Chalard Jean
2021-01-13[NS01.5] Fix an embarrassing bugChalard Jean
The existing implementations override the function with the int, so the default impl of the function with the int has to call the new one, not the other way around. Otherwise, when implementations are migrated to overriding the new one the old code continues to call the function with the int and that wouldn't work as expected if it didn't call the newly overridden method. Test: TH Change-Id: Ic31cec6481781e0185a0ba150be52390597737e7
2021-01-12Merge "[NS01] Add scoreless methods for non-score users" am: 0e777b61ed am: ↵Treehugger Robot
1e5d1fdf30 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1547378 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I840d5cc782123964159b005a6a1576b76a80a8df
2021-01-12Merge "[NS01] Add scoreless methods for non-score users" am: 0e777b61edTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1547378 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I27dce528911d4facd0c9168e8a57c1e85b7e67fe
2021-01-12Merge "[NS01] Add scoreless methods for non-score users"Treehugger Robot
2021-01-12Merge "Default write to byte array with native order" am: 8057279063 am: ↵Nucca Chen
6ab9e3a7ee Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1538726 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I34832a2cd0f3b8450fecf4b942d88bb1e105d91f
2021-01-12Merge "Default write to byte array with native order" am: 8057279063Nucca Chen
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1538726 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iff650cdd839ebd09a372e47b3d6a498e2e2b8d48
2021-01-12Merge "Default write to byte array with native order"Nucca Chen
2021-01-12[NS01] Add scoreless methods for non-score usersChalard Jean
Test: FrameworksNetTests NetworkStackTests Change-Id: I9ebd5cf17ec96b3e7c09ff041d65ee88d0b37cbf
2021-01-11Merge "Have a new library - netd-client in frameworks/libs/net" am: ↵Lucas Lin
62dd88e944 am: a549edc026 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1518277 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia3d8951cae6cb83686f2ae0fb33fa550fad72894
2021-01-11Merge "Have a new library - netd-client in frameworks/libs/net" am: 62dd88e944Lucas Lin
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1518277 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6c73e0e75391a559716fa772cea69f1167658486
2021-01-11Merge "Have a new library - netd-client in frameworks/libs/net"Lucas Lin
2021-01-08Move NetworkCapabilitiesUtils to framework-common am: ed288807a6 am: 369277cfdfRemi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535678 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I65459b713ed0301a04a49ee011c1191579a1e13e
2021-01-08Move NetworkCapabilitiesUtils to framework-common am: ed288807a6Remi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535678 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0c53d8cbee0fe941be62841d5beafc1def036d9c
2021-01-08Have a new library - netd-client in frameworks/libs/netlucaslin
Move BaseNetdUnsolicitedEventListener from tethering module to frameworks/libs/net and have a new library for it. Tethering module can still use BaseNetdUnsolicitedEventListener through netd-client and ConnectivityService and Nat464Xlat also can use it when both of them are under frameworks/base. Bug: 174837473 Test: Manual test and check the log. Change-Id: I44dff1c7639e50b8f20b54c6d5733139b20e2986
2021-01-07Move NetworkCapabilitiesUtils to framework-commonRemi NGUYEN VAN
Also move CollectionUtils which is a dependency. NetworkCapabilitiesUtils is needed in BatteryStatsImpl, which is in frameworks/base/core, so it uses the framework-common library. The current framework-common target cannot use androidx annotations due to users of this filegroup. This is being addressed in another change; use android.annotation annotations in the meantime. Bug: 174436414 Test: m Change-Id: Ie188572a6db7c1bea37550a3410d7d828409a902
2021-01-05Default write to byte array with native ordermarkchien
Bug: 173167302 Test: atest BpfMapTest atest StructTest Change-Id: I60a22ea4cd44697773d98d1720c02cc771643a9e
2020-12-28Merge "Adjust visibility rules for migration" am: 4a1b876a1e am: c88e16c4acBaligh Uddin
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535045 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0ce19c8ced0e69bb8be0a9f66f680a22d1c6645b
2020-12-28Merge "Adjust visibility rules for migration" am: 4a1b876a1eBaligh Uddin
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535045 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I282377a050e735fa6d6b13590b7147a14899b00b
2020-12-28Merge "Adjust visibility rules for migration"Baligh Uddin
2020-12-28Merge "Support common MacAddress Type in Struct." am: 71ed90e47b am: 359a688acbXiao Ma
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535663 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ife52a4db93ff9b57d17775ac91656bb6538605a7
2020-12-28Merge "Support common MacAddress Type in Struct." am: 71ed90e47bXiao Ma
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535663 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e0e18265c7d65919af2a5d96e17695789747ca2
2020-12-28Merge changes from topic "netutils_split" am: 22e240c1f2 am: b50e378f0aRemi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535674 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9f38207dc7d99687a7067b692b02c786ccb696de
2020-12-28Merge "Support common MacAddress Type in Struct."Xiao Ma
2020-12-28Merge changes from topic "netutils_split" am: 22e240c1f2Remi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535674 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I19074f452d25643a93f8307e3f395cbb37590090
2020-12-28Merge changes from topic "netutils_split"Remi NGUYEN VAN
* changes: Add DeviceConfigUtils version caching and tests Add getDisplayTransport Split NetworkStackUtils to frameworks/libs/net
2020-12-27Adjust visibility rules for migrationBaligh Uddin
Adjusting visibility to accomodate migration of frameworks/opt/net/wifi to packages/modules/Wifi. BUG: 137323948 Test: TH Change-Id: Iee3f2dc6fc5f3262fa9e81626a3e15a3226e4ab7
2020-12-25Merge "[Mainline] ProxyInfo migration" am: 1e54b66db4 am: 905e9e7f55Serik Beketayev
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1521964 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia91eff3fc951c2c1c778331aebe822b21287b972
2020-12-25Merge "[Mainline] ProxyInfo migration" am: 1e54b66db4Serik Beketayev
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1521964 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifad775527591e03100624ddea85d58ae8990ab64
2020-12-25Merge "[Mainline] ProxyInfo migration"Serik Beketayev
2020-12-25Add DeviceConfigUtils version caching and testsRemi NGUYEN VAN
Querying the APK version can be relatively expensive, so cache it with a static. Package version cannot change without restarting the process. Also add some testing for flags being equal to the min/max values. Bug: 17454103 Test: atest NetworkStaticLibTests Change-Id: I18c298beb843e0a9f76162d353623bb15ab155f1
2020-12-25Add getDisplayTransportRemi NGUYEN VAN
While networks can have multiple transports, users generally think of them as "wifi", "mobile data", "vpn" and expect them to be classified as such in UI such as settings. Add a getDisplayTransport utility that returns which transport should be used for UI display, from a list of transports of a network. Bug: 174436414 Test: atest NetworkStaticLibTests Change-Id: Iaefb47bcaa2f6ce2e7a2ae5011c340154009ac3c
2020-12-25Split NetworkStackUtils to frameworks/libs/netRemi NGUYEN VAN
Split DeviceConfig and collections-related utilities to CollectionUtils and DeviceConfigUtils in frameworks/libs/net. Also add implementations for contains(array, value), to avoid usage of internal non-API utils. The original tests are based on mockito-extended, so also add to NetworkStackTests as a dependency. This also requires setting the test app as debuggable in its manifest. Bug: 17454103 Test: atest NetworkStaticLibTests Change-Id: Ie9bed66a08b7370ebe50d0a7240b788f8b31aa77
2020-12-25Merge "Add ETHER_BROADCAST and DEFAULT_LINK_MTU constants." am: 8c390e7d89 ↵Xiao Ma
am: 0588afd33c Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5994fc684e1f1aba812b3c412c3154c357deae61
2020-12-25Merge "Add ETHER_BROADCAST and DEFAULT_LINK_MTU constants." am: 8c390e7d89Xiao Ma
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia0bb9fe32e9408e89a80ca80ed0be6f65376d883
2020-12-25Merge "Add ETHER_BROADCAST and DEFAULT_LINK_MTU constants."Xiao Ma
2020-12-24Merge "Add visibility rule for migration." into mainline-prodTreeHugger Robot
2020-12-24[automerger skipped] Add visibility rule for migration. am: 88b05d871d am: ↵Baligh Uddin
4d2b007e3c -s ours am skip reason: Change-Id Id19c650246a8f3d55d7b6a874840a6eebcd9eb17 with SHA-1 43f9f6189a is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535569 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie5b073b028754c535937ad86844991360410a91e
2020-12-24Add visibility rule for migration. am: 88b05d871dBaligh Uddin
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1535569 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6b2b3dc3b1fc4ef39221c04be23ce5c724443d41
2020-12-23[Mainline] ProxyInfo migrationSerik Beketayev
Bug: 173455434 Test: mma Change-Id: I49f7f491acc657051d9c79fc24605d4896cbc315
2020-12-24Support common MacAddress Type in Struct.Xiao Ma
MacAddress class is helpful to represent a 48-bits long MAC Address, we have to use 6-bytes array to interpret a MAC Address without a specific annotation type. To better parse the MAC Address appeared in the ether header, link-layer address option or Bpf class, it's worth supporting this specific type. Bug: 163492391 Test: atest NetworkStaticLibTests Change-Id: I1f716e5d4f38372fc5b7ee32e208d55a072c1e51
2020-12-24Add visibility rule for migration.Baligh Uddin
Add paths to visibility needed for tests. Soong allows specifying paths w/o validation. Once the migration is complete, we can remove the old path in visibility rules. BUG: 137323948 Test: TH Merged-In: Ie9a36ef65b72aeb99c9580c4d5ed29bf9367bd25 Change-Id: I03dbededd107ed5304857f798180aa78a0a9e36c Exempt-From-Owner-Approval: Migration CL
2020-12-24Add visibility rule for migration.Baligh Uddin
Add paths to visibility needed for tests. Soong allows specifying paths w/o validation. Once the migration is complete, we can remove the old path in visibility rules. BUG: 137323948 Test: TH Merged-In: Id19c650246a8f3d55d7b6a874840a6eebcd9eb17 Change-Id: I68de6a67b978ed5a2e721adf41329af349076696 Exempt-From-Owner-Approval: Cleanup CL
2020-12-24Merge "Add visibility rules for Connectivity project" am: 95ac9bd8df am: ↵Remi NGUYEN VAN
8bfc0c2b1c Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1517618 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17986aafb9fb26dad361e02f8ff24e36c74eca09
2020-12-24Merge "Add visibility rules for Connectivity project" am: 95ac9bd8dfRemi NGUYEN VAN
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1517618 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ice1785c36bbcc5ce3a6d3ba49f57e9fc073621b4
2020-12-24Merge "Add visibility rules for Connectivity project"Remi NGUYEN VAN
2020-12-23Merge cherrypicks of [13262411, 13262183] into mainline-releaseandroid-mainline-11.0.0_r19android-build-team Robot
Change-Id: I434bc030a0603f026a0e89833bdc98497c181892