Commit Graph

3398 Commits

Author SHA1 Message Date
Chalard Jean
1d884f2797 Merge "Have the status bar listen to all macro-users VPN changes." am: b16a6053fe
am: eb358dadac

Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824
2018-03-23 09:29:28 +00:00
Chalard Jean
eb358dadac Merge "Have the status bar listen to all macro-users VPN changes."
am: b16a6053fe

Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e
2018-03-23 09:22:36 +00:00
Chalard Jean
d1052c2cfa Merge "Have PermissionMonitor arbiter which app can access background networks"
am: 06f0fc04e7

Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2
2018-03-23 08:12:51 +00:00
Chalard Jean
b16a6053fe Merge "Have the status bar listen to all macro-users VPN changes." 2018-03-23 07:33:02 +00:00
Chalard Jean
973344d514 Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
am: 1f654aa247

Change-Id: I8d725b07e59654232ee41b82aac007dc6a495a01
2018-03-23 06:48:49 +00:00
Chalard Jean
1f654aa247 Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev 2018-03-23 06:36:47 +00:00
Chalard Jean
06f0fc04e7 Merge "Have PermissionMonitor arbiter which app can access background networks" 2018-03-23 06:15:00 +00:00
Chalard Jean
26aa91ab27 Have PermissionMonitor arbiter which app can access background networks
This will let ConnectivityService send the right callbacks to the
relevant apps.

Test: manual with apps
      runtest frameworks-net
      cts
      new tests for this functionality
Bug: 67408339

Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
2018-03-23 13:37:56 +09:00
Remi NGUYEN VAN
5eaa226243 Merge "Add method to NetworkStatsService for UID stats." am: db89ca3c12
am: af2fafe743

Change-Id: I2527d95000c7500c824ede70f87ecb38e21ed323
2018-03-23 04:01:09 +00:00
Remi NGUYEN VAN
af2fafe743 Merge "Add method to NetworkStatsService for UID stats."
am: db89ca3c12

Change-Id: I2c6cba3ebbc8c23ade754cfd411ac54a561b020a
2018-03-23 03:54:13 +00:00
Nathan Harold
4ca771aa5c Merge "Add MANAGE_IPSEC_TUNNELS Permission" into pi-dev
am: 0205fd1064

Change-Id: I7f1c987901c3634fb81d93402d5cb0af80fff11e
2018-03-23 01:57:41 +00:00
Nathan Harold
159788455c Add MANAGE_IPSEC_TUNNELS Permission
Add a new MANAGE_IPSEC_TUNNELS permission and
protect all IPsec Tunnel mode APIs with it.
This permission is only granted to the system or
through an AppOp.

Bug: 66955045
Test: compilation
Change-Id: I0f618373b500c493ef2211bece681f74652a1833
2018-03-22 14:16:50 -07:00
Nathan Harold
33ed612cca Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev 2018-03-22 18:31:03 +00:00
Chalard Jean
1d738004e8 Have PermissionMonitor arbiter which app can access background networks
This will let ConnectivityService send the right callbacks to the
relevant apps.

Test: manual with apps
      runtest frameworks-net
      cts
      new tests for this functionality
Bug: 67408339

Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
2018-03-22 19:03:59 +09:00
Remi NGUYEN VAN
088ff6824f Add method to NetworkStatsService for UID stats.
Useful for clients such as BatteryStats which currently rely
on NetworkStatsFactory. Data at that stage is incomplete as
it does not account for tethering, VT data and corresponding
464xlat corrections.

Test: runtest frameworks-net, CTS tests pass.
Change-Id: I763b77f601c827fd2963204694fb5b45425cc791
2018-03-22 15:31:28 +09:00
Chalard Jean
5b0c7c6403 Have the status bar listen to all macro-users VPN changes.
Bug: 73217368
Test: manual
      Using Datally on work profile. Before this, enabling the VPN
      does not show the key icon. After this it does.

Change-Id: I454eb8f3881a48af1b0187c2b14a2a399d3c2445
2018-03-22 13:25:09 +09:00
Nathan Harold
095b9e8e1c Merge changes I4c26aea7,I79911434 into pi-dev
* changes:
  Check mOwnedByTransform to avoid DELSA on SPI
  Expose add/removeAddress for IpSecInterfaces
2018-03-21 20:59:02 +00:00
nharold
66bce84357 Merge "Add NonNull Annotations To IpSec API Surface" am: baa4bf51c1
am: 08949e354f

Change-Id: I1aa2077978eba9e13586aeb4501769e2dd42728a
2018-03-21 20:37:59 +00:00
nharold
08949e354f Merge "Add NonNull Annotations To IpSec API Surface"
am: baa4bf51c1

Change-Id: I1393526aca627b430868816a83c8a40452521fc2
2018-03-21 20:28:55 +00:00
Nathan Harold
5cd64cc801 Add NonNull Annotations To IpSec API Surface
This CL adds NonNull annotations to a large
number of method returns and parameters as
part of API council feedback.

Bug: 72473424
Test: compilation (docstring-only change)
Merged-In: I2f865dde56fe12116c461ad98e9460bf1802ce18
Change-Id: I2f865dde56fe12116c461ad98e9460bf1802ce18
(cherry picked from commit 8fd26f67fd)
2018-03-21 11:15:28 -07:00
Nathan Harold
8fd26f67fd Add NonNull Annotations To IpSec API Surface
This CL adds NonNull annotations to a large
number of method returns and parameters as
part of API council feedback.

Bug: 72473424
Test: compilation (docstring-only change)
Change-Id: I2f865dde56fe12116c461ad98e9460bf1802ce18
2018-03-21 17:08:34 +00:00
Benedict Wong
f801b8ae69 Merge "Added implementation for VTI add/remove address" into pi-dev 2018-03-21 17:03:52 +00:00
nharold
763352f1f5 Merge "Expose add/removeAddress for IpSecInterfaces" am: 8e2b079f56
am: 189292cc36

Change-Id: Ib6780094b6b6b13146829b92fb3942a98cd96100
2018-03-21 04:45:15 +00:00
nharold
189292cc36 Merge "Expose add/removeAddress for IpSecInterfaces"
am: 8e2b079f56

Change-Id: Ia04b3bea771d0939cd33becfd792166df38ad0d6
2018-03-21 00:12:50 +00:00
Nathan Harold
c8f63060ad Expose add/removeAddress for IpSecInterfaces
When exposing the APIs, these were missed.
The outer structure is exposed, so this exposes
the addAddress and removeAddress methods.

Bug: 75234273
Test: compilation
Merged-In: I79911434f9baa660e4d8564cc59d80da4a710c42
Change-Id: I79911434f9baa660e4d8564cc59d80da4a710c42
(cherry picked from commit a83601a511)
2018-03-20 16:01:28 -07:00
Benedict Wong
da4b0c65a5 Added implementation for VTI add/remove address
This change adds implementation details for add/remove addresses onto a
VTI.

Bug: 73675031
Test: New tests added, passing on Walleye
Merged-In: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
Change-Id: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
(cherry picked from commit ecc9f7cc08)
2018-03-20 16:01:27 -07:00
nharold
8e2b079f56 Merge "Expose add/removeAddress for IpSecInterfaces" 2018-03-20 22:53:39 +00:00
Benedict Wong
6690b03c20 Merge "Add support for auth-only transforms" am: 275749c0b2
am: 51ca645608

Change-Id: I8a8a89c40ab97b81225520b80950937b11863134
2018-03-20 22:28:27 +00:00
Benedict Wong
51ca645608 Merge "Add support for auth-only transforms"
am: 275749c0b2

Change-Id: I75a4f75f7c8d0de40da329d4c0a86d546ee9fcb2
2018-03-20 22:06:30 +00:00
Benedict Wong
9be845c5cd Add support for auth-only transforms
Kernel limitations prevent auth-only SAs from being created. Explicitly
request a null encryption algorithm instead of omitting the algorithm
to comply with the kernel requirement for ESP.

Bug: 75049573
Test: CTS tests for auth-only, crypt-only transforms added for all
combinations of (UDP, TCP, IPv4, IPv6, UDP-encap) Also added unit
tests to ensure correct triggering of NULL_CRYPT usage.
Merged-In: Ia9a5cfee9c7786412846bc039f326420f6211c08
Change-Id: Ia9a5cfee9c7786412846bc039f326420f6211c08
(cherry picked from commit bf013a3820)
2018-03-20 12:34:52 -07:00
Nathan Harold
a83601a511 Expose add/removeAddress for IpSecInterfaces
When exposing the APIs, these were missed.
The outer structure is exposed, so this exposes
the addAddress and removeAddress methods.

Bug: 75234273
Test: compilation
Change-Id: I79911434f9baa660e4d8564cc59d80da4a710c42
2018-03-20 12:32:20 -07:00
Treehugger Robot
275749c0b2 Merge "Add support for auth-only transforms" 2018-03-20 18:36:04 +00:00
Benedict Wong
2e67bf5cac Merge "Added implementation for VTI add/remove address" am: 2543fbd8a2
am: 9dda91f806

Change-Id: Idaab45998f4765655bde6cf0274f2ba3c1b3ecf1
2018-03-20 00:09:15 +00:00
Benedict Wong
9dda91f806 Merge "Added implementation for VTI add/remove address"
am: 2543fbd8a2

Change-Id: Id49ef89d3076c9a6d5257b006965844ab77743ce
2018-03-19 23:45:10 +00:00
Benedict Wong
2543fbd8a2 Merge "Added implementation for VTI add/remove address" 2018-03-19 22:05:09 +00:00
nharold
a88433c216 Merge "Docstring Updates for applyTransportModeTransform" am: 00ef20e853
am: e3a6b678c3

Change-Id: I58ab2b451ef1d0c20efe80d30a679e8870a39a8e
2018-03-17 02:16:38 +00:00
nharold
e3a6b678c3 Merge "Docstring Updates for applyTransportModeTransform"
am: 00ef20e853

Change-Id: I2b59ebf0b751f7f404d175ad394a4dfdbf7169ff
2018-03-17 02:00:57 +00:00
Nathan Harold
7b7bea0485 Docstring Updates for applyTransportModeTransform
-Add anotations to usages of PolicyDirection for
 apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
 to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.

Bug: 73751066
Test: make docs
Merged-In: I9f2ec864466148a18899f1e952c74a525902ccbc
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
(cherry picked from commit f4cdf25a90)
2018-03-16 17:46:05 -07:00
Benedict Wong
bf013a3820 Add support for auth-only transforms
Kernel limitations prevent auth-only SAs from being created. Explicitly
request a null encryption algorithm instead of omitting the algorithm
to comply with the kernel requirement for ESP.

Bug: 75049573
Test: CTS tests for auth-only, crypt-only transforms added for all
combinations of (UDP, TCP, IPv4, IPv6, UDP-encap) Also added unit
tests to ensure correct triggering of NULL_CRYPT usage.
Change-Id: Ia9a5cfee9c7786412846bc039f326420f6211c08
2018-03-16 17:36:59 -07:00
nharold
00ef20e853 Merge "Docstring Updates for applyTransportModeTransform" 2018-03-17 00:33:10 +00:00
Nathan Harold
f4cdf25a90 Docstring Updates for applyTransportModeTransform
-Add anotations to usages of PolicyDirection for
 apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
 to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.

Bug: 73751066
Test: make docs
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
2018-03-16 17:29:45 -07:00
Benedict Wong
ecc9f7cc08 Added implementation for VTI add/remove address
This change adds implementation details for add/remove addresses onto a
VTI.

Bug: 73675031
Test: New tests added, passing on Walleye
Change-Id: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
2018-03-16 10:25:43 -07:00
dalyk
21d15049f4 Add new netd event callback for changes to private DNS validation state.
Test: None.
Bug: 71828272
Merged-In: Ib6824606b95deb23da2edd7aa4b96a0de66b12d1
Merged-In: Id88a4e846ae50536ac7b1541cf10c1fad1b1eeca
Change-Id: Ibf2683b9ff7c6cb69d7f4ad12b8bdff7cf7008f0
(cherry picked from commit 99c5029b91)
2018-03-13 22:39:59 +09:00
Erik Kline
be5e9b4257 Merge "Add new netd event callback for changes to private DNS validation state." am: 40ca5a06bf
am: 5e9725bdc7

Change-Id: Ib6824606b95deb23da2edd7aa4b96a0de66b12d1
2018-03-13 13:23:08 +00:00
Erik Kline
5e9725bdc7 Merge "Add new netd event callback for changes to private DNS validation state."
am: 40ca5a06bf

Change-Id: I504148b6a508b6f5e4b5dfa0976362496b91c15c
2018-03-13 13:11:37 +00:00
dalyk
99c5029b91 Add new netd event callback for changes to private DNS validation state.
Test: None.
Bug: 71828272
Change-Id: Ibf2683b9ff7c6cb69d7f4ad12b8bdff7cf7008f0
2018-03-12 15:00:55 -04:00
Pavel Maltsev
7f0ce628dc Merge "Fixing comments in Network Capabilities" am: e58f15fded
am: 9b3c003c46

Change-Id: If3c0d76f9598d931d801271c4d0634e15f4b9ed4
2018-03-12 08:08:31 +00:00
Pavel Maltsev
9b3c003c46 Merge "Fixing comments in Network Capabilities"
am: e58f15fded

Change-Id: Iacbcac2e740099ea6b6a6f7a646f046370fd16f5
2018-03-12 07:57:07 +00:00
Treehugger Robot
e58f15fded Merge "Fixing comments in Network Capabilities" 2018-03-12 07:42:58 +00:00
Pavel Maltsev
e18ef26a59 Fixing comments in Network Capabilities
Clean up after aosp/606338

Test: m -j (only comments has been changed)
Change-Id: I2627654450244024c2be92f9067534dfc2a80891
2018-03-09 10:42:32 -08:00