Commit Graph

6635 Commits

Author SHA1 Message Date
Lorenzo Colitti
dfe86f1e66 [automerger skipped] Merge "Freeze the networkstack-aidl-interfaces interface" into qt-dev
am: c2f1cc8b8e -s ours
am skip reason: change_id Ideabe73fc93bbefca2d624ee9ca190cf31419424 with SHA1 e72fe2bc46 is in history

Change-Id: I39438b1a3204aa82550ac83117a96f7549d19e42
2019-04-23 09:37:54 -07:00
Lorenzo Colitti
2dba5d9b48 Freeze the networkstack-aidl-interfaces interface
This freezes the interface as of the latest beta build, not the tip of
tree. IIpClient#setL2KeyAndGroupHint is not in the frozen definition in
particular.

Generated with:
m networkstack-aidl-interfaces-freeze-api \
    ipmemorystore-aidl-interfaces-freeze-api

Test: flashed, booted, WiFi and captive portal working
Bug: 128803828
Change-Id: Ideabe73fc93bbefca2d624ee9ca190cf31419424
Merged-In: Ideabe73fc93bbefca2d624ee9ca190cf31419424
(cherry picked from commit 9b89cdaaf401a6b77e160807039c06e537fa600a)
2019-04-23 09:41:44 +00:00
Lorenzo Colitti
0498b5aa98 Merge "Freeze the networkstack-aidl-interfaces interface" am: a746ac5036
am: adea8d6da1

Change-Id: I0bc827a6c7995eb7b50b4afeed11317ad8e29666
2019-04-23 01:55:01 -07:00
Lorenzo Colitti
adea8d6da1 Merge "Freeze the networkstack-aidl-interfaces interface"
am: a746ac5036

Change-Id: I32e335756927110e3200f002d32f9e1e8acfd779
2019-04-23 01:45:40 -07:00
Lorenzo Colitti
a746ac5036 Merge "Freeze the networkstack-aidl-interfaces interface" 2019-04-23 08:33:41 +00:00
Junyu Lai
74da4671c4 Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am: 123eb11c48
am: c47cd94455

Change-Id: I410acc19ceb13e32c65cbdf3095da9db0802470c
2019-04-23 01:18:54 -07:00
Junyu Lai
c47cd94455 Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
am: 123eb11c48

Change-Id: I2f5e0e11494866b054668c9224a8732cd8c035f9
2019-04-23 01:08:39 -07:00
Junyu Lai
123eb11c48 Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" 2019-04-23 07:48:08 +00:00
Chalard Jean
92cd2d6bff [automerger skipped] Merge "Fix an argument to the legacy broadcast" into qt-dev
am: 587d6cb141 -s ours
am skip reason: change_id I0fc408d546ae9d72b7dd9415e502252b484d4329 with SHA1 fe8c062223 is in history

Change-Id: I5ebe636715e8cf1ea5e42d12236c1f5fa07c38d0
2019-04-23 00:27:22 -07:00
Chalard Jean
587d6cb141 Merge "Fix an argument to the legacy broadcast" into qt-dev 2019-04-23 07:04:26 +00:00
Remi NGUYEN VAN
e72fe2bc46 Freeze the networkstack-aidl-interfaces interface
This freezes the interface as of the latest beta build, not the tip of
tree. IIpClient#setL2KeyAndGroupHint is not in the frozen definition in
particular.

Generated with:
m networkstack-aidl-interfaces-freeze-api \
    ipmemorystore-aidl-interfaces-freeze-api

Test: flashed, booted, WiFi and captive portal working
Bug: 128803828
Change-Id: Ideabe73fc93bbefca2d624ee9ca190cf31419424
2019-04-23 06:49:58 +00:00
junyulai
8368fe9fe0 [KA11] Verify fd ownership and allocate resource for NattKeepalive
Since socket keepalive APIs for UDP encapsulation sockets are
public to generic app. In order to ensure the given fd is valid,
this change verifies the resource id inside the UDP
encapsulation socket by using methods provided by IpSecService.

Bug: 125517194
Fix: 123968920
Test: 1. atest FrameworksNetTests --generate-new-metrics 10
      2. atestcom.android.server.ConnectivityServiceTest \
         #testNattSocketKeepalives --generate-new-metrics 100
Change-Id: I408aacc19b364683854d15a095c34e72389a6e5b
2019-04-23 10:47:19 +08:00
Chalard Jean
55cd1a323e Fix an argument to the legacy broadcast
Test: new test for this
Fixes: 62650382
Change-Id: I918b8271d3c3c058553ca888cb54cd36a6efba66
Merged-In: I0fc408d546ae9d72b7dd9415e502252b484d4329
Merged-In: I9282930106d1eee3274d9e5c4e89de60e929a0e6
2019-04-23 02:36:32 +00:00
Chalard Jean
fe8c062223 Merge "Fix an argument to the legacy broadcast" am: 5036127856
am: 182fe69f50

Change-Id: I0fc408d546ae9d72b7dd9415e502252b484d4329
2019-04-22 18:12:27 -07:00
Chalard Jean
182fe69f50 Merge "Fix an argument to the legacy broadcast"
am: 5036127856

Change-Id: I76149167598a862a2cc519fbf0b08df0887b27f0
2019-04-22 18:00:01 -07:00
Chalard Jean
5036127856 Merge "Fix an argument to the legacy broadcast" 2019-04-23 00:38:10 +00:00
Chenbo Feng
a93733fa35 [automerger skipped] Merge "Add smoke test for jni library" into qt-dev
am: 30096e070d -s ours
am skip reason: change_id Id24e7f0558b5643e4ad7393e85f1f0a2bd875615 with SHA1 dc2d592e68 is in history

Change-Id: Ib3f66d33a54be4216c098e2cde2023ece3fbf41e
2019-04-22 14:33:35 -07:00
Benedict Wong
37c1d5c0d8 Merge "Add NATT keepalive resources and methods into IpSecService" am: 4d31a792fa
am: 535187424f

Change-Id: I3affb5bdbb0c3f980b6606d728668e74c31646d0
2019-04-22 13:44:20 -07:00
Benedict Wong
535187424f Merge "Add NATT keepalive resources and methods into IpSecService"
am: 4d31a792fa

Change-Id: I97e7451959d619f42d68a5c29cca410bf0740852
2019-04-22 13:31:52 -07:00
TreeHugger Robot
30096e070d Merge "Add smoke test for jni library" into qt-dev 2019-04-22 20:14:31 +00:00
Benedict Wong
4d31a792fa Merge "Add NATT keepalive resources and methods into IpSecService" 2019-04-22 20:03:54 +00:00
Benedict Wong
886fff3866 Merge "Add configurability of LinkProperties, meteredness for Test Networks" am: c704b9fd07
am: b19bf0b92d

Change-Id: I9c8220efd56f72aabae028b48ac2f88ec7b8f659
2019-04-22 11:18:52 -07:00
Benedict Wong
b19bf0b92d Merge "Add configurability of LinkProperties, meteredness for Test Networks"
am: c704b9fd07

Change-Id: I3ad0ccc7fefbd6bd8888cd1f3f396effcdbfdd3b
2019-04-22 11:07:43 -07:00
Benedict Wong
c704b9fd07 Merge "Add configurability of LinkProperties, meteredness for Test Networks" 2019-04-22 17:41:20 +00:00
Paul Hu
42272ed304 Merge "Move more network unit tests to common tests" am: 77492e48c4
am: 8347b1da4b

Change-Id: I9f708a252ab606b782f5f828dce8c1690c3703bf
2019-04-22 07:30:55 -07:00
Paul Hu
8347b1da4b Merge "Move more network unit tests to common tests"
am: 77492e48c4

Change-Id: Id130368cd87ed262ef8eb926adf7b80fc3d7c2e3
2019-04-22 07:20:08 -07:00
Paul Hu
77492e48c4 Merge "Move more network unit tests to common tests" 2019-04-22 13:59:25 +00:00
Chalard Jean
24a433a538 Fix an argument to the legacy broadcast
Test: new test for this
Fixes: 62650382
Change-Id: I918b8271d3c3c058553ca888cb54cd36a6efba66
2019-04-22 22:26:16 +09:00
Chalard Jean
3a6f4ef9ab Merge "Make LegacyTypeTracker testable" into qt-dev
am: 9906de70a6

Change-Id: I0572183599ec28d317c5b6ebe56f80f19c965f64
2019-04-22 05:31:47 -07:00
Chalard Jean
9906de70a6 Merge "Make LegacyTypeTracker testable" into qt-dev 2019-04-22 12:08:59 +00:00
Chalard Jean
8c404439f1 [automerger skipped] Merge "Restrict access to dangerous methods to <= P" into qt-dev
am: 1e9660ec0a -s ours
am skip reason: change_id I95107f7b628eecb54e9f4411785186b668e9f3d8 with SHA1 01b3ffb147 is in history

Change-Id: I18b0c3f0f36f39e8cc758b98c3e8c44a23b69f25
2019-04-22 00:32:19 -07:00
TreeHugger Robot
1e9660ec0a Merge "Restrict access to dangerous methods to <= P" into qt-dev 2019-04-22 07:14:10 +00:00
Chalard Jean
865ec929f9 Make LegacyTypeTracker testable
...and add basic trivial tests for it.

Test: this, and ConnectivityServiceTest
Bug: 62650382
Change-Id: Ie7ca938e6f66f1b15feb6ed93afa0aebb20884ae
2019-04-22 15:44:23 +09:00
Chalard Jean
e9b4e8c7fa [automerger skipped] Merge changes Id598ae1d,I475bd011 am: eefe399495
am: 70d1b3b3fb -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
70d1b3b3fb Merge changes Id598ae1d,I475bd011
am: eefe399495

Change-Id: Ic02f8d900b6b430dc1a8bbfdc03297ad52157390
2019-04-21 19:29:00 -07:00
Chalard Jean
eefe399495 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
2b73c58736 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
bc6e9e7478 Merge "Make LegacyTypeTracker testable" am: 54cedaca89
am: 8bacdf6e64

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

Change-Id: I7dd63d9676862d3416ff75b43f2f8bdbce07134a
2019-04-21 17:13:47 -07:00
Benedict Wong
cece56e3ce 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
b6ebb67782 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
Chalard Jean
8cc4e876cd 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
7f38159e5b Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." am: df39b855b5
am: 8307a9a249

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

Change-Id: I429437f3f4c6f5159be907c287a9d59bceb537a5
2019-04-17 07:15:43 -07:00
Wayne Ma
df39b855b5 Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." 2019-04-17 13:58:11 +00:00
waynema
4152690a6e 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
c9d83b455f [automerger skipped] Merge "Move TrafficStats tags for the network stack constants" am: 8f6e99b370
am: 4a92ec452f -s ours
am skip reason: change_id I9b648ed6c687d56db61a54570c7880c51c1bae51 with SHA1 fec32def7c is in history

Change-Id: If30091ab2a164d01cab11fdd7e6e3aeaa805082c
2019-04-16 23:19:28 -07:00
Chalard Jean
4a92ec452f Merge "Move TrafficStats tags for the network stack constants"
am: 8f6e99b370

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

Change-Id: If17be16f184c1a515d754e14f800d0088bc80797
2019-04-16 22:58:06 -07:00
Chalard Jean
8f6e99b370 Merge "Move TrafficStats tags for the network stack constants" 2019-04-17 05:45:56 +00:00