Commit graph android_packages_modules_Co.../tests/net/java
Message SHA1
Merge "Add explicit override for default Private DNS mode" into pi-dev
am: 2b3c858296

Change-Id: If480ab40c7cf9ab75c52feafc28338a049cbceef

Erik Kline   authored and   android-build-merger   commited 2018-05-18 01:08:26 -07:00
51ae4f3c79
Add explicit override for default Private DNS mode
Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 79719289
Change-Id: I943c5476666e47d04690626e2133f501cb875b46

Erik Kline   commited 2018-05-17 17:41:12 +09:00
ae1a3af6ce
Merge "Fix testRegisterUsageCallback" am: b583c2c911
am: f5242645f6

Change-Id: If16708b5ce00dc374663e3c3dedd1d96342175f1

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-05-08 02:13:00 -07:00
53ecdf5876
Merge "Fix testRegisterUsageCallback"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2018-05-08 07:55:42 +00:00
b583c2c911
Merge changes from topic "ifaceStatsDetail" into pi-dev
* changes:
  Remove the unused file parsing function
  Use eBPF map data for per iface stats

android-build-team Robot   authored and   Android (Google) Code Review   commited 2018-05-02 19:17:27 +00:00
2a2480a824
Fix testRegisterUsageCallback
noteOp (introduced in go/ag/3897834) checks that the calling uid matches
the calling package, which is not correct when using a fake calling
package. Use the real package of the test so permissions are checked
properly.

The test currently only fails this way in pi-dev as noteOp is only used
in pi-dev.
Change-Id: I9ac3717af9335ba9efa0b8842a2df0d7b69ec9ab
Test: Fixed test now passes in pi-dev
Bug: b/78487385

Remi NGUYEN VAN   commited 2018-05-02 16:51:13 +09:00
34f851a5e3
Merge changes from topic "ifaceStats" am: dfd8e7ffff
am: da795087a6

Change-Id: I460bc25806182bc2dc5fcc2512ab01e776a0e8e6

android-build-prod (mdb)   authored and   android-build-merger   commited 2018-05-01 19:53:30 -07:00
8f22123764
Remove the unused file parsing function
With the new xt_bpf support for iface stats. We no longer need to parse
the per interface stats from /proc/net/dev. And since the old xt_qtaguid
code path also not depend on it, we can completly remove that helper
function since no caller is depending on it now.

Bug: 72111305
Test: runtest frameworks-net -c com.android.internal.net.NetworkStatsFactoryTest
Change-Id: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
Merged-In: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe
(cherry picked from aosp commit 6a2a9c93b0)

Chenbo Feng   commited 2018-05-01 19:48:03 -07:00
998ea37b66
Remove the unused file parsing function
With the new xt_bpf support for iface stats. We no longer need to parse
the per interface stats from /proc/net/dev. And since the old xt_qtaguid
code path also not depend on it, we can completly remove that helper
function since no caller is depending on it now.

Bug: 72111305
Test: runtest frameworks-net -c com.android.internal.net.NetworkStatsFactoryTest
Change-Id: Icb7eaeef0eeb9fdffd32a90316c76ee05bafffbe

Chenbo Feng   commited 2018-05-01 14:13:55 -07:00
6a2a9c93b0
Let DnsManager fill in LinkProperties for private DNSes
(clean cherry-pick from ag/3880157)

Test: new tests pass
Bug: 73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610
Merged-In: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811
Merged-In: I72ecaa4f7d7320ffa2e0ba82fadafc947c8a6981

Chalard Jean   commited 2018-04-27 13:32:10 +09:00
112bf112f3
Add the list of private DNS addresses to LinkProperties
(clean cherry-pick from ag/3874803)

Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad
Merged-In: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0
Merged-In: I6bdbef78d078d68534c8e07e9af031ce374560ef

Chalard Jean   commited 2018-04-27 13:32:10 +09:00
abc68d5552
Merge changes I0cd83a93,I03ae2bbb into pi-dev
am: 411e79b8b0

Change-Id: Iaa0285825735d3f16bba6e4946723a437fd9b0b9

Chalard Jean   authored and   android-build-merger   commited 2018-04-24 03:02:11 -07:00
fb0cb5fc65
Make sure getActiveNetwork is consistent with default callbacks
Bug: 77737389
Test: runtest framework-net
      new test don't pass without the main code change, but they
      do with it
Change-Id: I0cd83a935ab0b349aa47e065b830e5a43ab9a091

Chalard Jean   commited 2018-04-24 17:32:00 +09:00
d9605fb13f
Add tests for getActiveNetwork.
Bug: 77737389
Test: runtest frameworks-net
Change-Id: I03ae2bbb08559f2cd44979e291c1f5d50eb215da

Chalard Jean   commited 2018-04-24 15:23:28 +09:00
bc6af66da8
Merge "Let DnsManager fill in LinkProperties for private DNSes" into pi-dev
am: 2a915264a6

Change-Id: I837df61e3c277ae08ebf4fdcd4c4e9ac8c550811

Chalard Jean   authored and   android-build-merger   commited 2018-04-23 00:33:21 -07:00
fba9cb1fb9
Let DnsManager fill in LinkProperties for private DNSes
Test: new tests pass
Bug: 73641539
Change-Id: I971ef4d27b22a435d7459e1c4b31a8715ef6e610

Chalard Jean   commited 2018-04-23 13:58:42 +09:00
127064568f
Merge "Add the list of private DNS addresses to LinkProperties" into pi-dev
am: f12a2130a4

Change-Id: I4b739c56e658690532ae9deb0b9a3bc9b2adf8b0

Chalard Jean   authored and   android-build-merger   commited 2018-04-20 04:49:43 -07:00
98d4e9d1c6
Add the list of private DNS addresses to LinkProperties
Test: atest android.net.LinkPropertiesTest, also new tests pass
Bug: 73641539
Change-Id: If33a35b1354a67db09411ff098f20064797296ad

Chalard Jean   commited 2018-04-20 16:48:43 +09:00
9ea008ff62
Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
am: 629091d727

Change-Id: Ie9bcdc9736c04ab787efc193311a20d03718b593

Jeff Sharkey   authored and   android-build-merger   commited 2018-04-16 10:19:39 -07:00
04aa1ff87a
Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev
am: 7f11c98a55

Change-Id: I2cc76316bca81c12e56337d6e36d82b0de6d9ded

Jeff Sharkey   authored and   android-build-merger   commited 2018-04-16 10:07:52 -07:00
8708f5a0b5
Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""
This reverts commit 4de48809c0.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I596d330d64942105f447bb613012bb11e281a805
Exempt-From-Owner-Approval: keep tests passing

Jeff Sharkey   commited 2018-04-16 16:50:34 +00:00
33a25ec466
Revert "OP_GET_USAGE_STATS should be noted, not checked."
This reverts commit fbb37a7f61.

Reason for revert: ijpedowitz@

Bug: 77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing

Jeff Sharkey   commited 2018-04-16 16:39:55 +00:00
4de48809c0
Merge "OP_GET_USAGE_STATS should be noted, not checked." into pi-dev
am: 64bbb2014e

Change-Id: I38f5aecdb94c8b886ca4eba5908ab1b4a9c1fb89

Jeff Sharkey   authored and   android-build-merger   commited 2018-04-14 18:11:58 -07:00
876c34224d
OP_GET_USAGE_STATS should be noted, not checked.
Per email feedback, we should be using "noteOp" instead of "checkOp"
when testing if caller holds OP_GET_USAGE_STATS, so that we record
that caller used the operation.

Bug: 77662908
Test: builds, boots
Exempt-From-Owner-Approval: keep tests passing
Change-Id: I3a60345d590534fdbc2c1248e0d30dc85a5d6772

Jeff Sharkey   commited 2018-04-13 19:32:25 +00:00
fbb37a7f61
Merge "Add a new ssid field in NetworkCapabilities." into pi-dev
am: 53d1a8d88d

Change-Id: Ia1f4e51b7c2e9118789242cf6d9e7576c4167cda

Chalard Jean   authored and   android-build-merger   commited 2018-04-13 02:14:02 -07:00
527920ddeb
Add a new ssid field in NetworkCapabilities.
Bug: 77891227
Test: frameworks-net
Change-Id: Ifba33ecd48ccecce7e8f8d05ff70bb85653f6163

Chalard Jean   commited 2018-04-13 15:38:35 +09:00
058cd31b1b
Merge "Added tests for MultipathPolicyTracker." into pi-dev
am: 471d6f0465

Change-Id: I2f47dd30f44722a0611967ce5375aa164f40c718

Remi NGUYEN VAN   authored and   android-build-merger   commited 2018-04-10 20:37:06 -07:00
9f4c89d433
Merge "Added tests for MultipathPolicyTracker." into pi-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2018-04-11 02:53:14 +00:00
471d6f0465
Added tests for MultipathPolicyTracker.
Test: atest com.android.server.connectivity.MultipathPolicyTrackerTest
Bug: b/72631572
Bug: b/72877610
Change-Id: I33d9cd77948ff76008a125e4e2786fbbc2b03032

Remi NGUYEN VAN   commited 2018-04-10 15:27:59 +09:00
abdb6e76b2
Trigger NetworkCallback events when private DNS usage has changed.
Relies on events sent from netd in aosp/578162.

Test: Added tests to ConnectivityServiceTest. Added a new test
class DnsManagerTest. Built a simple app that appears to
receive onLinkProperties events correctly upon manual changes
to the private DNS settings on a Pixel.
Bug: 71828272

Merged-In: I1e6c54ba016f6a165a302bd135a29d9332aaa235
Merged-In: I7705412803fb9aa707a18ae5a1c50292e084d851
Change-Id: I3223c1285a73d5d531c5051ce70007857caa57e3
(cherry picked from commit f4977499c4)

dalyk   authored and   Erik Kline   commited 2018-04-09 23:04:20 -07:00
0e57ff69ef
Merge "Trigger NetworkCallback events when private DNS usage has changed." am: ee7a76bfea
am: f6e025bddc

Change-Id: I1e6c54ba016f6a165a302bd135a29d9332aaa235

Erik Kline   authored and   android-build-merger   commited 2018-04-09 22:13:36 -07:00
924e61e1df
Merge "Force creation of Socket upon Transform application" into pi-dev
Benedict Wong   authored and   Android (Google) Code Review   commited 2018-04-09 20:55:30 +00:00
80c8724285
Trigger NetworkCallback events when private DNS usage has changed.
Relies on events sent from netd in aosp/578162.

Test: Added tests to ConnectivityServiceTest. Added a new test
class DnsManagerTest. Built a simple app that appears to
receive onLinkProperties events correctly upon manual changes
to the private DNS settings on a Pixel.
Bug: 71828272
Change-Id: I68665aaf74b7d59182cc6f9586b80b55b0dfe427

dalyk   commited 2018-04-09 16:45:22 -04:00
f4977499c4
Merge "Move the logic of (re)evaluation of Private DNS" into pi-dev
Erik Kline   authored and   Android (Google) Code Review   commited 2018-04-06 06:48:25 +00:00
857cc19432
Move the logic of (re)evaluation of Private DNS
Moves this out of ConnectivityService and into each NetworkMonitor
(where it's more self-contained).

Test: as follows
    - builds, flashes, boots
    - runtest frameworks-net passes
    - manual testing with working and non-working hostnames behaves
      somewhat (but not entirely) as expected, and not always quickly
Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 77140445
Merged-In: I5dc90ecfe6f6f10967b7501645ad8e030cb38982
Merged-In: Ida4967d22f0781524f0f269e30e653b8ec867258
Change-Id: Ic4322af3cb49149f2d975cb31f54b2ac7927f907
(cherry picked from commit 076bd3d8e3)

Erik Kline   commited 2018-04-05 19:18:47 -07:00
ab8b0f7c38
Merge "Move the logic of (re)evaluation of Private DNS" am: 5fa5c6a45f
am: 7eca54a614

Change-Id: I5dc90ecfe6f6f10967b7501645ad8e030cb38982

Erik Kline   authored and   android-build-merger   commited 2018-04-05 18:53:08 -07:00
5ad6030802
Merge "Update IpSecManager to use InetAddress and prefixLen" into pi-dev
am: b172d5b437

Change-Id: I03c0745662ab8868f719dc65c9ff8502e2ff817c

Benedict Wong   authored and   android-build-merger   commited 2018-04-05 17:34:11 -07:00
9ba93eb131
Move the logic of (re)evaluation of Private DNS
Moves this out of ConnectivityService and into each NetworkMonitor
(where it's more self-contained).

Test: as follows
    - builds, flashes, boots
    - runtest frameworks-net passes
    - manual testing with working and non-working hostnames behaves
      somewhat (but not entirely) as expected, and not always quickly
Bug: 64133961
Bug: 72345192
Bug: 73872000
Bug: 77140445
Change-Id: Ic4322af3cb49149f2d975cb31f54b2ac7927f907

Erik Kline   commited 2018-04-05 15:17:38 -07:00
076bd3d8e3
Update IpSecManager to use InetAddress and prefixLen
LinkAddress constructors are currently @hide; this change updates
IpSecManager to use InetAddress and prefixLen, and then construct a
LinkAddress internally. LinkAddress is used over the binder interface to
IpSecService to ensure validity.

Bug: 77528639
Test: CTS, Java unit tests ran on walleye
Change-Id: I19e124adef6d9f4992d8293db3190bcf74c95848

Benedict Wong   authored and   Nathan Harold   commited 2018-04-05 17:41:11 +00:00
8d2b143a65
Merge "Force creation of Socket upon Transform application" am: b5615519e0
am: c3fb781d74

Change-Id: I2034448a22461d51728e66bcc0e965821aa4a42f

Benedict Wong   authored and   android-build-merger   commited 2018-04-04 12:52:00 -07:00
91d76f41a5
Force creation of Socket upon Transform application
This change forces Socket and DatagramSocket to populate the
SocketImpl, ensuring that the socket file descriptor can be
retrieved when applying Transport mode Transforms

This is done by calling getSoLinger(), triggering a getImpl(), which
triggers setImpl() if needed.

Bug: 77491294
Test: Added tests in IpSecManagerTest, ran on walleye
Merged-In: I40da08b031357710eb794e0f866aec5660c79594
Change-Id: I40da08b031357710eb794e0f866aec5660c79594
(cherry picked from commit de3816b30d)

Benedict Wong   commited 2018-04-04 10:33:49 -07:00
f23b199a02
Merge "Mark networks with OEM_PAID always restricted" into pi-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2018-04-04 16:54:46 +00:00
af07949fe5
Mark networks with OEM_PAID always restricted
Bug: 68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest

Cherry-picked from AOSP with no conflicts

Merged-in: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
Change-Id: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
(cherry picked from commit efbacc0ccb70917b2782272e6b8f1a0fb3f56cbe)

Lorenzo Colitti   authored and   Pavel Maltsev   commited 2018-04-04 05:35:54 +00:00
653a5c203c
Force creation of Socket upon Transform application
This change forces Socket and DatagramSocket to populate the
SocketImpl, ensuring that the socket file descriptor can be
retrieved when applying Transport mode Transforms

This is done by calling getSoLinger(), triggering a getImpl(), which
triggers setImpl() if needed.

Bug: 77491294
Test: Added tests in IpSecManagerTest, ran on walleye
Change-Id: I40da08b031357710eb794e0f866aec5660c79594

Benedict Wong   commited 2018-04-03 17:04:55 -07:00
de3816b30d
Merge "Add AppOps Checks for MANAGE_IPSEC_TUNNELS" into pi-dev
am: 80a2bba9a6

Change-Id: Icd1b2cfc699ab44e4ca536b98298d5b23db7372e

Nathan Harold   authored and   android-build-merger   commited 2018-04-03 14:41:56 -07:00
2212205a5b
Add AppOps Checks for MANAGE_IPSEC_TUNNELS
Adds support for a new AppOp to permit services to
use IpSec tunnel mode. The IpSecService now needs
a context so change the service mode to a cached
service rather than a static service.

Bug: 66955045
Test: runtest frameworks-net
Change-Id: I17a4a286225b432c3e15ea1587d946189931b4f4

Nathan Harold   commited 2018-04-03 18:23:11 +00:00
34633df7e9
Merge "Fix PermissionMonitorTest that has been failing." into pi-dev
am: 6e66280d35

Change-Id: Ifb04fdda2b54b0bde8b6eeead3e0240d5cc1ff79

Chalard Jean   authored and   android-build-merger   commited 2018-04-02 20:14:29 +00:00
6c1be75558
Fix network usage stats on 464xlat tethered.
Usage stats corrections for 464xlat in NetworkStatsFactory are not applied
to tethered traffic. Add adjustments in NetworkStatsService. After
migrating external callers off NetworkStatsFactory, we will be able to
only apply adjustments in NetworkStatsService and remove stacked
interface tracking from NetworkStatsFactory.
Bug: 72107146
Fixes: 72107146
Test: runtest frameworks-net & manual - checked corrected network usage
Merged-In: Ieb25c41c651499fdd01225ae5ac21d95e3d823f5
Merged-In: I016722f3a0ae2ae0a1d48bfacc4fe07ee3578ef7
(cherry-pick of aosp I5ce450e616b4fddf21f2a491fe5d0c9e9f969bda)

Change-Id: Id41cf22a0f9a63cb1832e9375bfb045861f08e52

Remi NGUYEN VAN   commited 2018-04-02 13:30:02 +00:00
24c949481e
Fix PermissionMonitorTest that has been failing.
The fail is related to a recent fix to PermissionMonitor
that went into pi-dev only : ag/3799094, which fixed getting
the remote package name for the correct macro user instead of
the default. That fix had broken the test, this change fixes it.

Test: test now passes
Bug: 77315205
Change-Id: I26f8276eafe80478d5fefcff92e7dc2f12128bb4

Chalard Jean   commited 2018-04-02 07:44:21 +00:00
d5fa0ef148
Merge "Add method to NetworkStatsService for UID stats." into pi-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2018-04-02 05:40:04 +00:00
ce5d395bb1