LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,712 Commits 2 Branches 0 Tags
468e73ae954b768e8f3e4cdaea24f448b8111e59
Commit Graph

6712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Ma
468e73ae95 [automerger skipped] Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev am: cce8a9da85 -s ours 
am: f93c79666f -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1 89ddc90b91 is in history

Change-Id: Id15d4dc0e60c8506cd9b7b7a4f91d0d5348dd896
 2019-04-24 13:31:59 -07:00
Wayne Ma
f93c79666f [automerger skipped] Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev 
am: cce8a9da85 -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1 89ddc90b91 is in history

Change-Id: Ie9bfef68a5c78272d4c7b31e9427ba2f5c57d056
 2019-04-24 13:14:17 -07:00
Wayne Ma
4b9d936736 [automerger skipped] Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable. am: cd616ebc95 -s ours 
am: 1f71bd90d3 -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1 89ddc90b91 is in history

Change-Id: Ie9270d639d3faad1efd58fb8190365ca6a128882
 2019-04-24 09:39:22 -07:00
Wayne Ma
1f71bd90d3 [automerger skipped] Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable. 
am: cd616ebc95 -s ours
am skip reason: change_id I6dc9029af0df0d3b391210bd315516bdf1b5e4c9 with SHA1 89ddc90b91 is in history

Change-Id: Ic26258dd1ef7a0f3c7c802d764f83a272c3d519f
 2019-04-24 09:21:29 -07:00
Wayne Ma
cce8a9da85 Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable." into qt-dev 2019-04-24 13:05:59 +00:00
Rubin Xu
8f5b53bb23 Merge "Reinstate new VPN uid filtering unit tests" am: 14ae90a4a6 am: c5f2f8e08d 
am: f8905980dc

Change-Id: I327acdf20cb9bad61c9e4c193298edd0f2e69f2f
 2019-04-24 03:15:38 -07:00
Rubin Xu
f8905980dc Merge "Reinstate new VPN uid filtering unit tests" am: 14ae90a4a6 
am: c5f2f8e08d

Change-Id: Ic2faef44831575b2d03bc00ef2553d5c549adc95
 2019-04-24 03:05:12 -07:00
Rubin Xu
c5f2f8e08d Merge "Reinstate new VPN uid filtering unit tests" 
am: 14ae90a4a6

Change-Id: Ib76c2cf319377141a374b3bdcf5e6606aaf9c06b
 2019-04-24 02:53:44 -07:00
Treehugger Robot
14ae90a4a6 Merge "Reinstate new VPN uid filtering unit tests" 2019-04-24 09:37:49 +00:00
Aaron Huang
c7902418a4 Merge "Move NattKeepalivePacketData out of the framework" am: d3ee38785b am: 382b3d2a63 
am: 82184fd8ce

Change-Id: Ie1d02bb7bccb76415cf71824147466cabf6b88b6
 2019-04-23 22:48:59 -07:00
Aaron Huang
82184fd8ce Merge "Move NattKeepalivePacketData out of the framework" am: d3ee38785b 
am: 382b3d2a63

Change-Id: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4
 2019-04-23 21:26:03 -07:00
Aaron Huang
382b3d2a63 Merge "Move NattKeepalivePacketData out of the framework" 
am: d3ee38785b

Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08
 2019-04-23 21:17:26 -07:00
Aaron Huang
d3ee38785b Merge "Move NattKeepalivePacketData out of the framework" 2019-04-24 04:00:56 +00:00
Paul Hu
a2d880cc34 Merge "Merge "Add tests for DhcpErrorEvent" am: 8aec50df25 am: 1fe65ae26c" into qt-dev-plus-aosp 
am: 2a9ec5525d

Change-Id: I78d78dd421cc3ffea774ff5eaa6aa758debc9cf2
 2019-04-23 11:00:58 -07:00
Lorenzo Colitti
96e0813e8f [automerger skipped] Merge "Freeze the networkstack-aidl-interfaces interface" into qt-dev am: c2f1cc8b8e -s ours 
am: 7cfad41d70 -s ours
am skip reason: change_id Ideabe73fc93bbefca2d624ee9ca190cf31419424 with SHA1 683df1d39a is in history

Change-Id: I4407d6f86052f0a31615b387d98c1f0df770889a
 2019-04-23 10:30:28 -07:00
Rubin Xu
3dc90033a9 Reinstate new VPN uid filtering unit tests 
Mock out PackageManager and returns correct information corresponding
to the test app package itself.

Test: atest --generate-new-metrics 10 com.android.server.ConnectivityServiceTest
Bug: 114231106
Bug: 130397860
Change-Id: Ib921700eda417f411d7a2c77c1140fba9ab50bbb
 2019-04-23 18:04:14 +01:00
Paul Hu
5bc4f002b0 Merge "Add tests for DhcpErrorEvent" am: 8aec50df25 
am: 1fe65ae26c

Change-Id: I9b65a2eef94567d2b79a9955619938e64906080d
 2019-04-23 09:50:28 -07:00
Lorenzo Colitti
7cfad41d70 [automerger skipped] Merge "Freeze the networkstack-aidl-interfaces interface" into qt-dev 
am: c2f1cc8b8e -s ours
am skip reason: change_id Ideabe73fc93bbefca2d624ee9ca190cf31419424 with SHA1 683df1d39a is in history

Change-Id: I39438b1a3204aa82550ac83117a96f7549d19e42
 2019-04-23 09:37:54 -07:00
Paul Hu
1fe65ae26c Merge "Add tests for DhcpErrorEvent" 
am: 8aec50df25

Change-Id: I7e6271e9becc974ea38d405914a87859ab700877
 2019-04-23 09:12:25 -07:00
Paul Hu
8aec50df25 Merge "Add tests for DhcpErrorEvent" 2019-04-23 11:31:03 +00:00
Lorenzo Colitti
7266129a6c 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
932ac91aac Merge "Freeze the networkstack-aidl-interfaces interface" am: fe7f6005c7 am: 93b816a98a 
am: aa110c6209

Change-Id: Ide252f5f20da432e35cf85e46f503bcc3fa81260
 2019-04-23 02:05:07 -07:00
Lorenzo Colitti
aa110c6209 Merge "Freeze the networkstack-aidl-interfaces interface" am: fe7f6005c7 
am: 93b816a98a

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

Change-Id: I32e335756927110e3200f002d32f9e1e8acfd779
 2019-04-23 01:45:40 -07:00
Lorenzo Colitti
fe7f6005c7 Merge "Freeze the networkstack-aidl-interfaces interface" 2019-04-23 08:33:41 +00:00
Junyu Lai
1d107caa7a Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am: 91cc5cc467 am: a1ed113552 
am: 7e2ba67527

Change-Id: I4ddfe4c8a54b4ad42926aad7e4e02319899b8d51
 2019-04-23 01:30:08 -07:00
Junyu Lai
7e2ba67527 Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am: 91cc5cc467 
am: a1ed113552

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

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

Change-Id: I39ee787e815baef40e84b4e9a09216c1dfcafe99
 2019-04-23 00:47:13 -07:00
Chalard Jean
f9360a6b69 [automerger skipped] Merge "Fix an argument to the legacy broadcast" into qt-dev 
am: d6222a41c4 -s ours
am skip reason: change_id I0fc408d546ae9d72b7dd9415e502252b484d4329 with SHA1 ac1bcee0b8 is in history

Change-Id: I5ebe636715e8cf1ea5e42d12236c1f5fa07c38d0
 2019-04-23 00:27:22 -07:00
Chalard Jean
d6222a41c4 Merge "Fix an argument to the legacy broadcast" into qt-dev 2019-04-23 07:04:26 +00:00
Remi NGUYEN VAN
683df1d39a 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
2bb85a0bc0 [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
e6a296dca5 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
4cf467b331 Merge "Fix an argument to the legacy broadcast" am: 157c444fcf am: 40b6f96f8d 
am: ac1bcee0b8

Change-Id: I9282930106d1eee3274d9e5c4e89de60e929a0e6
 2019-04-22 18:45:25 -07:00
Chalard Jean
ac1bcee0b8 Merge "Fix an argument to the legacy broadcast" am: 157c444fcf 
am: 40b6f96f8d

Change-Id: I0fc408d546ae9d72b7dd9415e502252b484d4329
 2019-04-22 18:12:27 -07:00
Chalard Jean
40b6f96f8d Merge "Fix an argument to the legacy broadcast" 
am: 157c444fcf

Change-Id: I76149167598a862a2cc519fbf0b08df0887b27f0
 2019-04-22 18:00:01 -07:00
Chalard Jean
157c444fcf Merge "Fix an argument to the legacy broadcast" 2019-04-23 00:38:10 +00:00
Chenbo Feng
0e5f95b959 [automerger skipped] Merge "Add smoke test for jni library" into qt-dev am: 43e577b152 -s ours 
am: 47da44b38f -s ours
am skip reason: change_id Id24e7f0558b5643e4ad7393e85f1f0a2bd875615 with SHA1 ba01e6c570 is in history

Change-Id: I4d76e5a101ca4ca460649dbe02e8915e175101a0
 2019-04-22 15:27:09 -07:00
Chenbo Feng
47da44b38f [automerger skipped] Merge "Add smoke test for jni library" into qt-dev 
am: 43e577b152 -s ours
am skip reason: change_id Id24e7f0558b5643e4ad7393e85f1f0a2bd875615 with SHA1 ba01e6c570 is in history

Change-Id: Ib3f66d33a54be4216c098e2cde2023ece3fbf41e
 2019-04-22 14:33:35 -07:00
Benedict Wong
118ac8ea65 Merge "Add NATT keepalive resources and methods into IpSecService" am: 8ab1de2439 am: 866cba5a1b 
am: 6934b250e2

Change-Id: I65a8e6d4b4d7c8ccbd708eb3bc16a19becfff43c
 2019-04-22 14:11:15 -07:00
Benedict Wong
6934b250e2 Merge "Add NATT keepalive resources and methods into IpSecService" am: 8ab1de2439 
am: 866cba5a1b

Change-Id: I3affb5bdbb0c3f980b6606d728668e74c31646d0
 2019-04-22 13:44:20 -07:00
Benedict Wong
866cba5a1b Merge "Add NATT keepalive resources and methods into IpSecService" 
am: 8ab1de2439

Change-Id: I97e7451959d619f42d68a5c29cca410bf0740852
 2019-04-22 13:31:52 -07:00
TreeHugger Robot
43e577b152 Merge "Add smoke test for jni library" into qt-dev 2019-04-22 20:14:31 +00:00
Benedict Wong
8ab1de2439 Merge "Add NATT keepalive resources and methods into IpSecService" 2019-04-22 20:03:54 +00:00
Benedict Wong
cdbcefb4b5 Merge "Add configurability of LinkProperties, meteredness for Test Networks" am: a57dada482 am: 248e00b41e 
am: 8b2466b437

Change-Id: I67769d9e06b9658560b5785dca2d49ad4d869973
 2019-04-22 11:32:21 -07:00
Benedict Wong
8b2466b437 Merge "Add configurability of LinkProperties, meteredness for Test Networks" am: a57dada482 
am: 248e00b41e

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

Change-Id: I3ad0ccc7fefbd6bd8888cd1f3f396effcdbfdd3b
 2019-04-22 11:07:43 -07:00
Benedict Wong
a57dada482 Merge "Add configurability of LinkProperties, meteredness for Test Networks" 2019-04-22 17:41:20 +00:00