Commit graph android_packages_modules_Co.../staticlibs
Message SHA1
Update NetworkProvider calls for API council request
Bug: 152238712
Test: FrameworksNetTests
Copy from ag/10825365
Change-Id: Iec50554a9548a5cbdcf556a1a0536d9a94559793
Merged-In: Iec50554a9548a5cbdcf556a1a0536d9a94559793

Chalard Jean   authored and   Aaron Huang   commited 2020-03-31 11:58:43 +00:00
6edf7b01e5
Make NetworkFactory a single-use object.
Currently, when bluetooth tethering is disabled, the bluetooth
process crashes because unregister() calls setScoreFilter() and
immediately nulls out mProvider. This crashes as soon as the
message posted by setScoreFilter() dereferences mProvider from
the handler thread.

This sort of teardown problem is very difficult to fix given
NetworkFactory's threading model where some code runs on the
handler thread and some code runs on whatever thread calls it.
Instead of complicating the code to do this, simply make it
impossible to call register() after having called unregister().
The only factory that does so today is bluetooth tethering, and
that can be trivially modified to create and register a new
factory instead.

This CL renames the unregister() method to terminate() in order
to make it clear that the object cannot be reused, and also to
ensure that no other code in the tree is unexpectedly calling
unregister().

Bug: 148635501
Test: atest FrameworksNetTests
Change-Id: Icf4c7a957e46e4ba017c0a5984e5c42a75b36ecd
Merged-In: Icf4c7a957e46e4ba017c0a5984e5c42a75b36ecd

Lorenzo Colitti   commited 2020-03-17 01:39:56 +09:00
0e9e646d5b
Merge "Add IpRange utility to convert IP ranges to IpPrefix"
Benedict Wong   authored and   Gerrit Code Review   commited 2020-02-04 22:49:50 +00:00
3fa91de697
Add IpRange utility to convert IP ranges to IpPrefix
IKE Traffic Selectors are defined to be an IP range, with a start and an
end IP address. However, the Android system works in IP Prefixes. This
commit adds a utility to convert between the two.

Bug: 144246767
Test: New tests added, passing
Change-Id: I428fee682dea21346f92c5c628642dee3c785ba9

Benedict Wong   commited 2020-01-29 23:08:10 -08:00
db0915c14c
Update CompareOrUpdateResult with NULL NULL Check
Add a test to CompareOrUpdateResult where the new and old item
list are both NULL.

Test: Updated unit test
Change-Id: I6821028409d29ab864af52685629630cbf16db3b

Tyler Wear   commited 2020-01-28 16:42:22 -08:00
3767434b21
Update CompareOrUpdateResult with NULL Check
Like CompareResult, add in null check for input objects.

Test: updated unit test
Change-Id: Iea63752ff23a5bfb1cc5cb716ec579bec6c403bf

Tyler Wear   commited 2020-01-27 10:55:38 -08:00
65e8b66875
Merge "Updates to NetworkFactory for the new NetworkAgent constructor"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-01-22 06:23:35 +00:00
8cd3a6c287
Merge "Statically link DnsSdTxtRecord into framework-wifi"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-01-22 06:23:25 +00:00
fd71d872b2
Merge "libs(net/common): Create filegroups for wifi sources"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-01-22 04:36:02 +00:00
27c8b2773a
Merge "Address MacAddressUtils / NetworkFactory comments"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-01-22 04:35:49 +00:00
8c06cabb4f
Merge "Add DnsSdTxtRecord to common net static library"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-01-22 04:35:37 +00:00
9a208493ba
Merge "Fix visibility for services-common lib"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-01-22 04:35:25 +00:00
062272b951
Merge "Build module common libs as system_current"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2020-01-22 04:35:11 +00:00
1fe6903738
Add a CompareOrUpdateResult class.
This is like CompareResult, but also has the concept of an item
being "updated" (i.e., the same, but with different properties,
in the old and the new list of items). This is needed to support
updating routes.

Bug: 142892223
Test: new unit test
Change-Id: Ide5e31acb9baa6a5d3f50e9965d4019eb7c82cd4

Lorenzo Colitti   commited 2020-01-21 17:26:48 +09:00
9c0c6a5c05
Run NetworkStaticLibTests on the actual source files.
Currently, NetworkStaticLibTests tests the class files that are
on the bootclasspath of the device. This makes running these
tests slow and/or confusing, because the framework must be
rebuilt and the device flashed before running the tests, and if
this is not done, the old code will be tested instead.

Instead, jarjar the tests so the test can be run without updating
the device.

Bug: 142892223
Test: atest NetworkStaticLibTests passes on device that does not have the library
Change-Id: I6a0dbebddbd0b64e2722078345ffe6b0c0a1801e

Lorenzo Colitti   commited 2020-01-21 15:52:34 +09:00
5d9f8ed872
Updates to NetworkFactory for the new NetworkAgent constructor
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Merged-In: If327cf0ffd917f9cb358f9ed3779da58fce40ef8
Change-Id: If327cf0ffd917f9cb358f9ed3779da58fce40ef8
(clean cherry-pick from internal branch)

Chalard Jean   authored and   Remi NGUYEN VAN   commited 2020-01-21 10:41:14 +09:00
c9366dec3b
Statically link DnsSdTxtRecord into framework-wifi
DnsSdTxtRecord is @hide, thus need to statically
link it into framework-wifi.

Bug: 135998869
Test: boots up and connects to wifi
Merged-In: Ic5f7decfdbc3116a15fe8da3841cc7620105996d
Change-Id: Ic5f7decfdbc3116a15fe8da3841cc7620105996d
(clean cherry-pick from internal branch)

David Su   authored and   Remi NGUYEN VAN   commited 2020-01-21 10:41:14 +09:00
37535278c4
libs(net/common): Create filegroups for wifi sources
Safer for wifi to just include the sources that it needs. Then there is
no accidental risk of un-jar-jar'ed classes showing up in it's
namespace.

Bug: 135998869
Test: Compiles
Merged-In: I2532f640fbebd4ca82be7bbb63744bcad653ac34
Change-Id: I2532f640fbebd4ca82be7bbb63744bcad653ac34
(clean cherry-pick from internal branch)

Roshan Pius   authored and   Remi NGUYEN VAN   commited 2020-01-21 10:41:14 +09:00
864bdec16e
Address MacAddressUtils / NetworkFactory comments
Remove unused code, and make NetworkRequest iterating order
deterministic.

Test: atest FrameworksNetTests FrameworksWifiTests \
          FrameworksTelephonyTests
Bug: 138306002

Merged-In: I1a8f2b07dd1b3ef8286c8b578ed7ae38c87bb38c
Change-Id: I1a8f2b07dd1b3ef8286c8b578ed7ae38c87bb38c
(clean cherry-pick from internal branch)

Remi NGUYEN VAN   commited 2020-01-21 10:41:14 +09:00
fc8056d7bd
Add DnsSdTxtRecord to common net static library
Move DnsSdTxtRecord from framework to net-utils-framework-common
for mainline support.

Bug: 139268426
Bug: 135998869
Test: build lib pass
      atest FrameworksNetTests
     ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Merged-In: I16c37b1c0b70bd57f38bde1171bd7d84cf3fa9ce
Change-Id: I16c37b1c0b70bd57f38bde1171bd7d84cf3fa9ce
(clean cherry-pick from internal branch)

Aaron Huang   authored and   Remi NGUYEN VAN   commited 2020-01-21 10:41:14 +09:00
0331db1c2c
Fix visibility for services-common lib
f/b/services/net should be allowed, not just f/b/services.

Test: Dependent change using the build rule builds
Bug: 138306002
Merged-In: Ide48e637df6e1c21cd7c0c688e3fef2ba1c97deb
Change-Id: Ide48e637df6e1c21cd7c0c688e3fef2ba1c97deb
(clean cherry-pick from internal branch)

Remi NGUYEN VAN   commited 2020-01-21 10:41:14 +09:00
376f8d4922
Build module common libs as system_current
The libraries need to build as system_current since they will be used in
modules that should build against that SDK.

As notable changes, NetworkFactory stops using a common BASE for
handler messages, as no message ID is shared with other handlers (all
public messages numbers are for receiving only). It also indexes
NetworkRequests by using the request itself in the request table; this
is fine because .equals() / .hashCode() are implemented properly, and
no request can be used that has the same ID but differences in other
members.

Test: built, flashed, WiFi and telephony working
Test: atest FrameworksNetTests FrameworksWifiTests \
          FrameworksTelephonyTests
Bug: 138306002
Merged-In: I2ea2be0039b67ba34fc26e62bdb839ab7d42300c
Change-Id: I2ea2be0039b67ba34fc26e62bdb839ab7d42300c
(clean cherry-pick from internal branch)

Remi NGUYEN VAN   commited 2020-01-21 10:41:14 +09:00
ce241a3b79
Add a net-utils-telephony-common library for NetworkFactory.
A separate target is necessary for telephony as it needs to jarjar
included classes.

Test: atest FrameworksNetTests FrameworksWifiTests \
          FrameworksTelephonyTests
Bug: 138306002
Change-Id: I4b7f79fc43fe5820c94226662bee0216b61fc599
Merged-In: I4b7f79fc43fe5820c94226662bee0216b61fc599
(clean cherry-pick from internal branch)

Lorenzo Colitti   authored and   Remi NGUYEN VAN   commited 2020-01-21 10:41:05 +09:00
e14bd343e0
Add net-utils-services-common library
net-utils-services-common-srcs for files in src_servicescommon
and library net-utils-services-common could be used in services.jar
or modules.

Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksTelephonyTests
Change-Id: I5043a34100e9ef26148e3a0c1743363d063a3604
Merged-In: I5043a34100e9ef26148e3a0c1743363d063a3604
(clean cherry-pick from internal branch)

Aaron Huang   authored and   Remi NGUYEN VAN   commited 2020-01-21 10:40:58 +09:00
57a9496f19
Add NetUtils to net static library
This class includes network common utilities.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Bug: 143925787
Test: build lib pass
      atest NetworkStaticLibTests
Change-Id: I1ffe723aa4ff2ed7bc46f34106701c91fe93032a

Aaron Huang   commited 2020-01-13 00:43:54 +08:00
05a9dfef78
Add a new static library for mainline modules
Add a network static library for common utilities. This
library could be used by all mainline modules. Initially
create LinkPropertiesUtils and MacAddressUtils.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: build lib pass
      atest NetworkStaticLibTests
Change-Id: I8f79e4f836819ac83007acffb55103e5d69873e0

Aaron Huang   commited 2020-01-13 00:43:22 +08:00
f73ff8cfce