LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,607 Commits 2 Branches 0 Tags
42272ed304ca8b148d159f3bfcc4d76c26d506f2
Commit Graph

6607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Chalard Jean
b922da3fd6 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
aae112566e Merge "Fix DnsResolver API could not bypass private DNS correctly" into qt-dev 2019-04-17 05:38:05 +00:00
Chalard Jean
fec32def7c 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
c6016895c7 Fix DnsResolver API could not bypass private DNS correctly 
Bug: 130594022
Test: atest DnsResolverTest

Merged-In: Ic9e078f8acf7688850dfe31f15ed065739ad5281
(cherry picked from commit 973f5707bc)

Change-Id: I1788157c784b0ec124bd7d78ba90278b5501d0d4
 2019-04-16 12:41:02 +00:00
Luke Huang
f3291b79de Merge "Fix DnsResolver API could not bypass private DNS correctly" am: 2a443c804f 
am: f114a31fd9

Change-Id: Ib2f8ae73e2a9d76d87243d53cac1157032156082
 2019-04-16 02:27:28 -07:00
Luke Huang
f114a31fd9 Merge "Fix DnsResolver API could not bypass private DNS correctly" 
am: 2a443c804f

Change-Id: Iaa36a882c2bcfd3bb11153d2b37cdab887ad9004
 2019-04-16 02:17:09 -07:00
Luke Huang
2a443c804f Merge "Fix DnsResolver API could not bypass private DNS correctly" 2019-04-16 09:03:22 +00:00
Chalard Jean
5070e31499 Restrict access to dangerous methods to <= P 
Test: make
Fixes: 130143562
Change-Id: I1a6a472f83cf00a1ab174a9c5e67d3e9357a0c45
Merged-In: I95107f7b628eecb54e9f4411785186b668e9f3d8
Merged-In: I890030580fdad45c3f8589bf6adbe5798d578cfe
(cherry picked from commit aa91c9de56)
 2019-04-16 06:13:09 +00:00
Chalard Jean
01b3ffb147 Merge "Restrict access to dangerous methods to <= P" am: 722e228453 
am: 1b53b5a755

Change-Id: I95107f7b628eecb54e9f4411785186b668e9f3d8
 2019-04-15 22:39:08 -07:00
Chalard Jean
1b53b5a755 Merge "Restrict access to dangerous methods to <= P" 
am: 722e228453

Change-Id: I3c1271e00e026518e9c4ddafc931a2cac87dcee0
 2019-04-15 22:29:28 -07:00
Chalard Jean
722e228453 Merge "Restrict access to dangerous methods to <= P" 2019-04-16 05:17:20 +00:00
Junyu Lai
5cfe230c07 Merge "Release keepalive slot after stopped" am: 5adfab71bc 
am: b78d0b4ae1

Change-Id: I8bf18f5dd10412f251071cea8140793b22c7fd95
 2019-04-15 22:16:02 -07:00
Junyu Lai
b78d0b4ae1 Merge "Release keepalive slot after stopped" 
am: 5adfab71bc

Change-Id: Ic707f22fb12c98c187e89cc8ad39773f61737506
 2019-04-15 22:04:18 -07:00
Junyu Lai
5adfab71bc Merge "Release keepalive slot after stopped" 2019-04-16 04:46:18 +00:00
Luke Huang
f4cefaea66 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
Chalard Jean
e4d236243b 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
37033fd067 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
6f01452d74 [automerger skipped] API council feedbacks for DnsResolver 
am: 965ddfdc5d -s ours
am skip reason: change_id I5737cf293264bf9d492e7bd56b62bee4d49002eb with SHA1 dca57c2e44 is in history

Change-Id: I44c2d7e34d6351cc2b862aa99d0ef0260130961b
 2019-04-12 08:58:56 -07:00
Lorenzo Colitti
4a84f8cb71 Merge changes I4f181789,Ia8a0c99b am: f7d42a0a3c 
am: 7e04c116a3

Change-Id: Ib59e211d4329f885108de9ea0a74669ffb144e17
 2019-04-12 06:37:28 -07:00
Lorenzo Colitti
7e04c116a3 Merge changes I4f181789,Ia8a0c99b 
am: f7d42a0a3c

Change-Id: I50207fe29953be7759bbd01cb93268202067f764
 2019-04-12 06:29:44 -07:00
Remi NGUYEN VAN
f2654ce048 Merge "Revert "Block incoming non-VPN packets to apps under fully-routed VPN"" am: 01bfd9e510 
am: f7fe1ac9c4

Change-Id: I3e1c408fcfc14db8b2586a79416233ffe9e1173d
 2019-04-12 06:24:30 -07:00
Lorenzo Colitti
f7d42a0a3c Merge changes I4f181789,Ia8a0c99b 
* changes:
  Revert new tests and PackageManager mock
  Revert "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""
 2019-04-12 13:11:18 +00:00
Luke Huang
b2acaecb20 Merge "API council feedbacks for DnsResolver" am: 65dc1155ff 
am: dca57c2e44

Change-Id: Id731f73f25f437df94f936e9a3ec227b797b6031
 2019-04-12 05:31:10 -07:00
Lorenzo Colitti
c18f4b5f6f Revert new tests and PackageManager mock 
A mocked PackageManager caused test failures in existing tests.
Revert that for now to make tests pass again.

Bug: 114231106
Bug: 130397860
Test: atest FrameworksNetTests
Change-Id: I4f181789152438f18e6cd2d235d76fabe3872ea3
 2019-04-12 19:52:45 +09:00
Lorenzo Colitti
ee6a630257 Revert "Revert "Block incoming non-VPN packets to apps under fully-routed VPN"" 
This reverts commit 2b6cd177ba.

Reason for revert: Rolling forward, will fix tests in same CL stack.

Bug: 114231106
Bug: 130397860
Test: FrameworksNetTests
Change-Id: Ia8a0c99b4e1fd5dff26c881715cd876618ca4321
 2019-04-12 19:52:32 +09:00
Remi NGUYEN VAN
f7fe1ac9c4 Merge "Revert "Block incoming non-VPN packets to apps under fully-routed VPN"" 
am: 01bfd9e510

Change-Id: I601649e15c97a8fd1732c4d38dab9d5556c5f175
 2019-04-12 03:41:01 -07:00
Remi NGUYEN VAN
01bfd9e510 Merge "Revert "Block incoming non-VPN packets to apps under fully-routed VPN"" 2019-04-12 10:25:46 +00:00