Commit Graph

8650 Commits

Author SHA1 Message Date
Chalard Jean
c585808ae0 [automerger skipped] Merge changes Id598ae1d,I475bd011 am: 8fe63a3498
am: 36af3e6162 -s ours
am skip reason: change_id I325fd3eda6e89228353342f00a49f50b22b17071 with SHA1 14d635ac5b is in history

Change-Id: I9123fd3e3c712f084f49c63a570986c399382364
2019-04-21 19:37:06 -07:00
Chalard Jean
36af3e6162 Merge changes Id598ae1d,I475bd011
am: 8fe63a3498

Change-Id: Ic02f8d900b6b430dc1a8bbfdc03297ad52157390
2019-04-21 19:29:00 -07:00
Chalard Jean
8fe63a3498 Merge changes Id598ae1d,I475bd011
* changes:
  Fix a possible crash when the listener is null
  Straighten AIDL interface for the memory store
2019-04-22 02:15:04 +00:00
Chalard Jean
08c2d9e81f Straighten AIDL interface for the memory store
Some names were still wrong somehow, and the wrappers were
missing.

Test: NetworkStack & FrameworkNetTests
Change-Id: I475bd011ad9bc714a07021a9dfd85c4876f8e9ad
Merged-In: I475bd011ad9bc714a07021a9dfd85c4876f8e9ad
2019-04-22 00:40:28 +00:00
Chalard Jean
0da24d3ce9 Merge "Make LegacyTypeTracker testable" am: 54cedaca89 am: 080562b154
am: 1395062bb4

Change-Id: I097ff975b7a35a9d932e332c6ce63fec3c31da91
2019-04-21 17:34:17 -07:00
Chalard Jean
1395062bb4 Merge "Make LegacyTypeTracker testable" am: 54cedaca89
am: 080562b154

Change-Id: I53457ad6af430c551c6909a7e68127a3667efde9
2019-04-21 17:25:03 -07:00
Chalard Jean
080562b154 Merge "Make LegacyTypeTracker testable"
am: 54cedaca89

Change-Id: I7dd63d9676862d3416ff75b43f2f8bdbce07134a
2019-04-21 17:13:47 -07:00
Benedict Wong
bdf7048571 Add NATT keepalive resources and methods into IpSecService
This change adds a new NATTKeepalive resource type, along with the
associated allocation/deallocation. Additionally, this change allows
ReferenceCountedResource(s) to not be binder-linked, to allow the
ConnectivityService to verify ownership and allocate a NattKeepalive
without double-registering for binder-death notifications.

Bug: 125517194
Test: IpSecService frameworks tests ran
Change-Id: I8293f79940ad57dabb6f2b9de5e334d06b869443
2019-04-19 11:17:21 -07:00
Benedict Wong
6259ad2be9 Add configurability of LinkProperties, meteredness for Test Networks
This commit adds the ability to pass in LinkProperties and meteredness
for additional testing use cases.

Bug: ?
Test: Compiles. Test utility only.
Change-Id: Idf6c3bcae2dea5e61c0418b72b889496919be8ba
2019-04-19 10:46:56 -07:00
Aaron Huang
f7adc47367 Move NattKeepalivePacketData out of the framework
For implementing parcelable interface for NattKeepalivePacketData.
Move this class out of framework.jar and move to services.jar

This class is used in telephony-common.jar and it also loads
service.jar.

Bug: 33530442
Test: - build pass
      - atest NetworkStackTests
      - atest ConnectivityServiceTest

Change-Id: Id2fdec5c4015d2cefd8a93e0cfdcc3c304fc9b64
2019-04-20 00:37:19 +08:00
Chalard Jean
3a3f5f2a08 Make LegacyTypeTracker testable
...and add basic trivial tests for it.

Test: this, and ConnectivityServiceTest
Bug: 62650382
Change-Id: Ie7ca938e6f66f1b15feb6ed93afa0aebb20884ae
2019-04-19 15:33:44 +09:00
Wayne Ma
cd616ebc95 Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable.
Test: built, flashed, booted
      atest FrameworksNetTests

Bug: 130788363
Change-Id: I3b4e8672f5273c3baa9378025bfaef2e6514df64
Merged-In: I6dc9029af0df0d3b391210bd315516bdf1b5e4c9
(cherry picked from commit 9e9fda7558a924feb86869fca7dc7fd7dd01a78c)
2019-04-18 11:06:51 +00:00
Wayne Ma
2ee3321b99 Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." am: c9308bb32d am: 009dcb2d12
am: 89ddc90b91

Change-Id: Ia52b06a0622877d242cfd0488b9f715eef25ad3d
2019-04-17 08:03:59 -07:00
Wayne Ma
89ddc90b91 Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." am: c9308bb32d
am: 009dcb2d12

Change-Id: I6dc9029af0df0d3b391210bd315516bdf1b5e4c9
2019-04-17 07:26:59 -07:00
Wayne Ma
009dcb2d12 Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable."
am: c9308bb32d

Change-Id: I429437f3f4c6f5159be907c287a9d59bceb537a5
2019-04-17 07:15:43 -07:00
Wayne Ma
c9308bb32d Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." 2019-04-17 13:58:11 +00:00
waynema
7b76545b94 Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable.
Test: built, flashed, booted
      atest FrameworksNetTests

Change-Id: I3b4e8672f5273c3baa9378025bfaef2e6514df64
2019-04-17 13:55:53 +00:00
Chalard Jean
3cb9574a5f [automerger skipped] Merge "Move TrafficStats tags for the network stack constants" am: 2a9f0c45f4 am: dc058515a0 -s ours
am: 0a0f19e5a5 -s ours
am skip reason: change_id I4882686a86e7c6d42f4b0619b921d02619ed6d4c with SHA1 acb64a0bd3 is in history

Change-Id: I3e682721ed3e8a574d84d12baf84cc2d6c097412
2019-04-17 00:06:14 -07:00
Luke Huang
c2f017970e [automerger skipped] Merge "Fix DnsResolver API could not bypass private DNS correctly" into qt-dev am: efe4ae92fc
am: 84f51a85bf -s ours
am skip reason: change_id Ic9e078f8acf7688850dfe31f15ed065739ad5281 with SHA1 cd449cc201 is in history

Change-Id: Id5542048791df174c17b5c74651dddc5ee304b7f
2019-04-16 23:49:33 -07:00
Chalard Jean
0a0f19e5a5 [automerger skipped] Merge "Move TrafficStats tags for the network stack constants" am: 2a9f0c45f4
am: dc058515a0 -s ours
am skip reason: change_id I9b648ed6c687d56db61a54570c7880c51c1bae51 with SHA1 3add1ec143 is in history

Change-Id: If30091ab2a164d01cab11fdd7e6e3aeaa805082c
2019-04-16 23:19:28 -07:00
Chalard Jean
dc058515a0 Merge "Move TrafficStats tags for the network stack constants"
am: 2a9f0c45f4

Change-Id: I13ba9e3077bb4ec28229a09f2d4747a43c281bcc
2019-04-16 23:08:07 -07:00
Luke Huang
84f51a85bf Merge "Fix DnsResolver API could not bypass private DNS correctly" into qt-dev
am: efe4ae92fc

Change-Id: If17be16f184c1a515d754e14f800d0088bc80797
2019-04-16 22:58:06 -07:00
Chalard Jean
2a9f0c45f4 Merge "Move TrafficStats tags for the network stack constants" 2019-04-17 05:45:56 +00:00
Chalard Jean
39d4d02520 Move TrafficStats tags for the network stack constants
As per API council feedback, these constants should live in
a place that is private to the network stack, only with a
range defined in system API.

Bug: 129433383
Test: m
Change-Id: I84a90f84a9af6fef4667ee4d512ebd0413222086
Merged-In: I4882686a86e7c6d42f4b0619b921d02619ed6d4c
Merged-In: I9b648ed6c687d56db61a54570c7880c51c1bae51
2019-04-17 05:45:40 +00:00
TreeHugger Robot
efe4ae92fc Merge "Fix DnsResolver API could not bypass private DNS correctly" into qt-dev 2019-04-17 05:38:05 +00:00
Chalard Jean
acb64a0bd3 Merge "Move TrafficStats tags for the network stack constants" into qt-dev am: e7ef0a61f2
am: 3add1ec143

Change-Id: I4882686a86e7c6d42f4b0619b921d02619ed6d4c
2019-04-16 17:38:30 -07:00
Chalard Jean
3add1ec143 Merge "Move TrafficStats tags for the network stack constants" into qt-dev
am: e7ef0a61f2

Change-Id: I9b648ed6c687d56db61a54570c7880c51c1bae51
2019-04-16 15:06:03 -07:00
Luke Huang
830600090c Fix DnsResolver API could not bypass private DNS correctly
Bug: 130594022
Test: atest DnsResolverTest

Merged-In: Ic9e078f8acf7688850dfe31f15ed065739ad5281
(cherry picked from commit c21eb1fb31dff7b05aabbbc2f45caf587095abc3)

Change-Id: I1788157c784b0ec124bd7d78ba90278b5501d0d4
2019-04-16 12:41:02 +00:00
Luke Huang
cd449cc201 Merge "Fix DnsResolver API could not bypass private DNS correctly" am: 9c138c7a13 am: 5410ef4882
am: e45f6e2d0d

Change-Id: Ic9e078f8acf7688850dfe31f15ed065739ad5281
2019-04-16 02:37:43 -07:00
Luke Huang
e45f6e2d0d Merge "Fix DnsResolver API could not bypass private DNS correctly" am: 9c138c7a13
am: 5410ef4882

Change-Id: Ib2f8ae73e2a9d76d87243d53cac1157032156082
2019-04-16 02:27:28 -07:00
Luke Huang
5410ef4882 Merge "Fix DnsResolver API could not bypass private DNS correctly"
am: 9c138c7a13

Change-Id: Iaa36a882c2bcfd3bb11153d2b37cdab887ad9004
2019-04-16 02:17:09 -07:00
Luke Huang
9c138c7a13 Merge "Fix DnsResolver API could not bypass private DNS correctly" 2019-04-16 09:03:22 +00:00
Chalard Jean
6fb1669b65 Restrict access to dangerous methods to <= P
Test: make
Fixes: 130143562
Change-Id: I1a6a472f83cf00a1ab174a9c5e67d3e9357a0c45
Merged-In: I95107f7b628eecb54e9f4411785186b668e9f3d8
Merged-In: I890030580fdad45c3f8589bf6adbe5798d578cfe
(cherry picked from commit 0bb53dbb64bbc937a23e1dc7641c8988a6d11d64)
2019-04-16 06:13:09 +00:00
Chalard Jean
40a9b8c93f Merge "Restrict access to dangerous methods to <= P" am: 861e9b56bd am: acb2474e18
am: 22178e1557

Change-Id: I890030580fdad45c3f8589bf6adbe5798d578cfe
2019-04-15 23:08:09 -07:00
Junyu Lai
7bc046c913 Merge "Release keepalive slot after stopped" am: 79c7b5a300 am: 82a0ddb40d
am: 2ffcae18d9

Change-Id: I790f6bbc5efc3f088034ac45ec379da5f781d0ca
2019-04-15 23:00:02 -07:00
Chalard Jean
22178e1557 Merge "Restrict access to dangerous methods to <= P" am: 861e9b56bd
am: acb2474e18

Change-Id: I95107f7b628eecb54e9f4411785186b668e9f3d8
2019-04-15 22:39:08 -07:00
Chalard Jean
acb2474e18 Merge "Restrict access to dangerous methods to <= P"
am: 861e9b56bd

Change-Id: I3c1271e00e026518e9c4ddafc931a2cac87dcee0
2019-04-15 22:29:28 -07:00
Chalard Jean
861e9b56bd Merge "Restrict access to dangerous methods to <= P" 2019-04-16 05:17:20 +00:00
Junyu Lai
2ffcae18d9 Merge "Release keepalive slot after stopped" am: 79c7b5a300
am: 82a0ddb40d

Change-Id: I8bf18f5dd10412f251071cea8140793b22c7fd95
2019-04-15 22:16:02 -07:00
Junyu Lai
82a0ddb40d Merge "Release keepalive slot after stopped"
am: 79c7b5a300

Change-Id: Ic707f22fb12c98c187e89cc8ad39773f61737506
2019-04-15 22:04:18 -07:00
Junyu Lai
79c7b5a300 Merge "Release keepalive slot after stopped" 2019-04-16 04:46:18 +00:00
Luke Huang
4c349d2ed2 Fix DnsResolver API could not bypass private DNS correctly
Bug: 130594022
Test: atest DnsResolverTest
Change-Id: Ibf3edac3075d921d189237c485871efb869b320b
2019-04-16 11:57:45 +08:00
Chenbo Feng
9b4ab05070 Add smoke test for jni library
Since the Framework net test require jni library
libnetworkstatsfactorytestjni, but the test fails to load that library
unless *all* the dependencies of that library are explicitly listed in
jni_libs, whenever any of the dependencies changes the framework net
test will start failing and it might not be catched since the change
might not related to frameworks/base. And this smoke test is aimed to
spot those native library changes and it should be stable enough to put
in global presubmit.

Bug: 124764595
Test: FrameworksNetSmokeTests
Change-Id: Id24e7f0558b5643e4ad7393e85f1f0a2bd875615
Merged-In: Id24e7f0558b5643e4ad7393e85f1f0a2bd875615
(cherry picked from commit 5f8a630da7d5b308c0824a25f6fc1dd4c7552c9f)
2019-04-15 19:02:56 -07:00
Chalard Jean
e01a8ccfd7 Move TrafficStats tags for the network stack constants
As per API council feedback, these constants should live in
a place that is private to the network stack, only with a
range defined in system API.

Bug: 129433383
Test: m
Change-Id: I84a90f84a9af6fef4667ee4d512ebd0413222086
(cherry picked from commit 79a6330650ca04bd7a08afbd63f8016a3b30bc72)
2019-04-16 00:41:54 +09:00
junyulai
e1bed4ddfa Release keepalive slot after stopped
Currntly, keepalive slot is released when stop() is called. Next
starting keepalive can use the same slot number while previous
keepalive is still stopping. When the previous keepalive is
stopped, the incoming as will be processed by the new keepalive.

This change release keepalive slot after the result of stopping
has returned. Thus, newly created keepalive cannot allocate the
same slot number while lower layer is still processing stop event.

This change also disable flaky assertions that are caused by
test port has been occupied by other process.

Bug: 129512753
Test: 1. atest com.android.server.ConnectivityServiceTest \
         #testNattSocketKeepalives --generate-new-metrics 100
      2. atest FrameworksNetTests --generate-new-metrics 10
      3. simulate the fail case manually.

Change-Id: I1991627545519ee5cb408a3df3a006f710f4af7b
2019-04-15 17:44:48 +08:00
Luke Huang
bb0d94dbf2 [automerger skipped] API council feedbacks for DnsResolver am: 0494f8833d -s ours
am: 4a61906395 -s ours
am skip reason: change_id I5737cf293264bf9d492e7bd56b62bee4d49002eb with SHA1 d836f86f4b is in history

Change-Id: I0781beb81ab6bf9499544548b0e50796797dee87
2019-04-12 10:19:05 -07:00
Luke Huang
4a61906395 [automerger skipped] API council feedbacks for DnsResolver
am: 0494f8833d -s ours
am skip reason: change_id I5737cf293264bf9d492e7bd56b62bee4d49002eb with SHA1 d836f86f4b is in history

Change-Id: I44c2d7e34d6351cc2b862aa99d0ef0260130961b
2019-04-12 08:58:56 -07:00
Lorenzo Colitti
853716fc65 Merge "Merge changes I4f181789,Ia8a0c99b am: 1744b240f6 am: c4ac34f834" into qt-dev-plus-aosp
am: 9d301638d1

Change-Id: Id57ce4ff83e38b21f293d109287fadb15c2429a3
2019-04-12 08:13:50 -07:00
Remi NGUYEN VAN
d693333ef1 Merge "Revert "Block incoming non-VPN packets to apps under fully-routed VPN"" am: 27a60a1aff am: 8de7fec0d0
am: 0539d81793

Change-Id: I7807613ec8c6667dcc994ae4eb3e13bab387f10a
2019-04-12 07:44:57 -07:00
Lorenzo Colitti
73a6ab946c Merge changes I4f181789,Ia8a0c99b am: 1744b240f6
am: c4ac34f834

Change-Id: Ib59e211d4329f885108de9ea0a74669ffb144e17
2019-04-12 06:37:28 -07:00