Commit Graph

5923 Commits

Author SHA1 Message Date
Luke Huang
df6794ca21 Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" am: cfd6cdf447
am: f3b2546131

Change-Id: Idb5909a8a537ae155a985670cfaf4e993ef3d95d
2019-03-20 23:28:53 -07:00
Luke Huang
f3b2546131 Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion"
am: cfd6cdf447

Change-Id: I86ca4cab29099b26f797ef6fce94dbb6f5183b90
2019-03-20 23:18:25 -07:00
Luke Huang
cfd6cdf447 Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" 2019-03-21 06:01:25 +00:00
Lucas Lin
7e756a45cd Merge "Improve partial connectivity" am: ce8235772b
am: 8f78c70595

Change-Id: Ie68acfe6e2182588cdd8b70d67651241573b2189
2019-03-20 20:56:16 -07:00
Lucas Lin
8f78c70595 Merge "Improve partial connectivity"
am: ce8235772b

Change-Id: I19c41c88d32643f82531c7afc3d4248ef9b44b53
2019-03-20 20:45:42 -07:00
Lucas Lin
ce8235772b Merge "Improve partial connectivity" 2019-03-21 03:34:30 +00:00
Luke Huang
c5fdf01476 Cleanup NetworkManagementService for Netd commnads binder migrartion
remove dead code used for netd UNIX sokcet

Bug: 65862741
Test: atest NetworkManagementServiceTest FrameworksNetTests
Change-Id: I5db61cb86325b71ac8a8fce7b15dbf569abc5935
2019-03-20 20:02:24 +08:00
Lorenzo Colitti
664a133340 Merge changes from topic "framework-no-networkstack-aidl" am: 0063d13ca7
am: 6214a4705c

Change-Id: Ie5e1e5fce574ca993b1ec2a998f49f9201c59b4d
2019-03-20 03:38:52 -07:00
Lorenzo Colitti
1ce0f8ef6e Move TcpKeepalivePacketData out of the framework. am: d9d3bced06
am: 8e71306c9e

Change-Id: I5f90bdf3993c472f5564164e17106d2a59233656
2019-03-20 03:32:50 -07:00
Lorenzo Colitti
33d91ce93c Stop using netd parcelables in the framework. am: 196fe35040
am: 60a5a9416b

Change-Id: I5a8e45d669f36dfdc67b9f9533d0ff6a24e8f27c
2019-03-20 03:28:08 -07:00
lucaslin
2afb4bcbcb Improve partial connectivity
Improve the design and fix some nits.

Bug: 113450764
Test: 1. Build pass
      2. atest FrameworksNetTests
      3. atest NetworkStackTests
      4. Change captive_portal_https_url to https://invalid.com
      to simulate partial connectivity.
Change-Id: Ia56645841d00d2ed8406cfeacb86a4a27fd58650
2019-03-20 18:21:59 +08:00
Lorenzo Colitti
6214a4705c Merge changes from topic "framework-no-networkstack-aidl"
am: 0063d13ca7

Change-Id: I13ba3cb016a63353cfa62a61106d16e30eff0076
2019-03-20 03:18:47 -07:00
Lorenzo Colitti
8e71306c9e Move TcpKeepalivePacketData out of the framework.
am: d9d3bced06

Change-Id: I7657e6827299ad398bc16bc792150fd901226b4d
2019-03-20 03:11:11 -07:00
Lorenzo Colitti
60a5a9416b Stop using netd parcelables in the framework.
am: 196fe35040

Change-Id: Ic4ac445c582ff8b55d253d99de6750d250e9d9e5
2019-03-20 03:03:27 -07:00
Lorenzo Colitti
0063d13ca7 Merge changes from topic "framework-no-networkstack-aidl"
* changes:
  Remove the framework dependency on netd_aidl_parcelables-java.
  Move TcpKeepalivePacketData out of the framework.
  Stop using netd parcelables in the framework.
2019-03-20 09:45:37 +00:00
Remi NGUYEN VAN
94aebc6bc6 Merge "Add documentation for CaptivePortal APP_RETURN_*" am: a15a1c53d5
am: d623ba8571

Change-Id: I1e14b2d2d5f49980601f2e75eeffc992997de3f5
2019-03-19 23:02:52 -07:00
Remi NGUYEN VAN
d623ba8571 Merge "Add documentation for CaptivePortal APP_RETURN_*"
am: a15a1c53d5

Change-Id: Idc55c5c729e2a66ad845dbc8ddaf97580c7ae8cc
2019-03-19 22:53:43 -07:00
Remi NGUYEN VAN
a15a1c53d5 Merge "Add documentation for CaptivePortal APP_RETURN_*" 2019-03-20 05:40:41 +00:00
Remi NGUYEN VAN
887c5f639d Merge "Add Parcelable implementation for ApfCapabilities" am: 9a35341fe2
am: 78d8ff6bf8

Change-Id: Iecec6a6376e2ff64d24813dbdb5b958f6968d627
2019-03-19 17:59:22 -07:00
Remi NGUYEN VAN
78d8ff6bf8 Merge "Add Parcelable implementation for ApfCapabilities"
am: 9a35341fe2

Change-Id: I218b583755259a8c0824777c3247a090bdbd348b
2019-03-19 17:51:34 -07:00
Remi NGUYEN VAN
9a35341fe2 Merge "Add Parcelable implementation for ApfCapabilities" 2019-03-20 00:34:53 +00:00
Lorenzo Colitti
d9d3bced06 Move TcpKeepalivePacketData out of the framework.
This class is not used in framework.jar, only in services.jar.
Move it out of the framework so framework.jar can stop depending
on the NetworkStack stable AIDL interfaces.

This should really under com.android.server as well, but that's
a cross-project change to be done in another CL.

Test: m
Bug: 128804404
Change-Id: Ib2805f7fcc516a5f6989c252365d1c95b8042703
Merged-In: Ib2805f7fcc516a5f6989c252365d1c95b8042703
2019-03-20 08:56:31 +09:00
Lorenzo Colitti
196fe35040 Stop using netd parcelables in the framework.
The only actual users of these classes are in services.jar, not
in frameworks.jar. The only reason the framework depends on them
is that the code that converts to and from stable parcelables is
currently in the framework. Move that code to services and cut
the dependency.

These classes aren't used in the networkstack app so they don't
need to be in shared. They also can't be in shared because the
classes are not in the SDK. So put the conversion functions
directly inside their only user (NetworkManagementService).

Also remove the jarjar rules that rename the classes for use by
the NetworkStack app.

This does not actually remove the dependency from the build file,
that will be done in a future CL.

Bug: 128804404
Test: builds, boots
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest HostsideVpnTests
Change-Id: I027d50ba56091f5558f45e6e08f32e5912b2a82a
Merged-In: I027d50ba56091f5558f45e6e08f32e5912b2a82a
2019-03-20 08:56:24 +09:00
Chenbo Feng
273632beed Merge "Add uid information in PackageListObserver" am: 63e0701ecb
am: b6972b2566

Change-Id: I61f46bf443c2027ed70a884f0cbb3ede80a8c1f3
2019-03-19 14:53:10 -07:00
Chenbo Feng
b6972b2566 Merge "Add uid information in PackageListObserver"
am: 63e0701ecb

Change-Id: I4fef26fed802902d6a69563c19704a94916ff834
2019-03-19 14:42:14 -07:00
Treehugger Robot
63e0701ecb Merge "Add uid information in PackageListObserver" 2019-03-19 21:19:16 +00:00
Varun Anand
fefcada377 Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 0572cf6752
am: 42db9375aa

Change-Id: I7ab73884266bc4b64d1914557a29e84fc4de431e
2019-03-19 09:37:37 -07:00
Varun Anand
42db9375aa Merge "Add unit tests related to data accounting for VPNs with one underlying network."
am: 0572cf6752

Change-Id: I91971112870c7a3a2d4786c25125204de7e008f5
2019-03-19 09:28:22 -07:00
Treehugger Robot
0572cf6752 Merge "Add unit tests related to data accounting for VPNs with one underlying network." 2019-03-19 16:18:28 +00:00
Xiao Ma
f693b45d57 Merge "Move the IpMemoryStore to the network stack." am: 3b3aabfb68
am: e0f77826f7

Change-Id: I20e384320309579b19fe44f3841ffbc49c028c6d
2019-03-19 06:44:45 -07:00
Xiao Ma
e0f77826f7 Merge "Move the IpMemoryStore to the network stack."
am: 3b3aabfb68

Change-Id: I672d07ca2d0a251c246993ab8c7c3075de385570
2019-03-19 06:35:31 -07:00
Xiao Ma
3b3aabfb68 Merge "Move the IpMemoryStore to the network stack." 2019-03-19 13:21:12 +00:00
Remi NGUYEN VAN
cd13f8f3d5 Add documentation for CaptivePortal APP_RETURN_*
This fixes API review requests.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 126883311
Change-Id: I0632a98675e65c5e722e81a2c1e0cf1403b54395
2019-03-19 18:57:44 +09:00
Luke Huang
aef7db0037 Merge "Replace Handler with Executor for async DNS API" am: 44bd665c9e
am: b856fc1410

Change-Id: I40ce45d039e01f831b6f4f50ed360a2a206a1146
2019-03-18 23:25:58 -07:00
Luke Huang
9f9d2e8f02 Merge "Refactor answer callback for async DNS query JAVA API" am: b65af07286
am: 9ddf2c10aa

Change-Id: I7538b247c5bd84d7f5b21be11b9bb1940fb9ba5a
2019-03-18 23:09:58 -07:00
Luke Huang
b856fc1410 Merge "Replace Handler with Executor for async DNS API"
am: 44bd665c9e

Change-Id: I5fb0d659d27894ca9f243654f9283764f1369745
2019-03-18 23:05:15 -07:00
Luke Huang
9ddf2c10aa Merge "Refactor answer callback for async DNS query JAVA API"
am: b65af07286

Change-Id: I26eb642cc04e3804cd82a56e45a890689b3c643f
2019-03-18 22:55:37 -07:00
Luke Huang
44bd665c9e Merge "Replace Handler with Executor for async DNS API" 2019-03-19 05:35:39 +00:00
Luke Huang
b65af07286 Merge "Refactor answer callback for async DNS query JAVA API" 2019-03-19 05:35:18 +00:00
Mark Chien
057dc5b976 Merge "Remove deprecated entitlement API" am: 9d9850ae30
am: c818ace0cc

Change-Id: I6028d1f11f99bf5719f0d2a5b387fe651905aba3
2019-03-18 20:22:09 -07:00
Mark Chien
c818ace0cc Merge "Remove deprecated entitlement API"
am: 9d9850ae30

Change-Id: I6b19b684a1dfa509ee77304d6acfe3fcdb6ca69c
2019-03-18 20:00:35 -07:00
Mark Chien
9d9850ae30 Merge "Remove deprecated entitlement API" 2019-03-19 02:44:37 +00:00
Chenbo Feng
f3e11e733d Add uid information in PackageListObserver
The uid information of a removed package cannot be retrieved by the
packageName anymore once it is removed. So it would be useful to provide
the uid of removed package in the onPackageAdded and onPackageRemoved
method of the PackageListObserver. This modification helps simplify the
design in PermissionMonitor.

Bug: 125396053
Test: dumpsys netd trafficcontroller

Exempt-From-Owner-Approval: Already merged in internal master
Merged-In: I2bd4bdf924687960a4fa3a47235bae68d885e445
Change-Id: I2bd4bdf924687960a4fa3a47235bae68d885e445
2019-03-18 19:32:29 -07:00
Chalard Jean
0727435c56 Move the IpMemoryStore to the network stack.
Test: atest FrameworksNetTests
Change-Id: Ic5bd6ff54b09a6fa92b6863f240a5b053011acb6
2019-03-18 11:33:17 +09:00
Remi NGUYEN VAN
f363d924dc Merge "Remove NetworkParcelable" am: 7391d04a26
am: 7dc93f8a1e

Change-Id: Ice0f04749d2b7c2863ad18c29f5967649127ee0e
2019-03-17 18:55:26 -07:00
Remi NGUYEN VAN
7dc93f8a1e Merge "Remove NetworkParcelable"
am: 7391d04a26

Change-Id: I8dc6d665a33d19ecad2bd5f611c2b68e08d53b97
2019-03-17 18:44:58 -07:00
Remi NGUYEN VAN
7391d04a26 Merge "Remove NetworkParcelable" 2019-03-18 01:30:25 +00:00
Luke Huang
9aa1520d40 Replace Handler with Executor for async DNS API
Bug: 124882626
Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: Ie1dc27643d4767f2a8a39da755edf388a00962d5
2019-03-16 18:53:07 +08:00
Luke Huang
144cd67c38 Refactor answer callback for async DNS query JAVA API
1. refactor AnswerCallback with a generic type
2. support onError in AnswerCallback
3. Fix minor problem reported from API Review

Bug: 124882626
Test: built, flashed, booted
      atest DnsResolverTest DnsPacketTest

Change-Id: I685c9989f8401acb63d2e83f552b2d5b20c41af0
2019-03-16 18:53:05 +08:00
Varun Anand
e22525bf92 Add unit tests related to data accounting for VPNs with one underlying
network.

This is to establish a baseline for the existing behavior, and to ensure
that following changes are not causing a regression in existing
behavior.

This CL is also adding missing cleanup for NetworkStatsCollectionTest
which was forcing all network types in NetworkTemplate that was causing
NetworkStatsService related tests to fail.

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Change-Id: I285f186cfb16bc9fa704c797996b1e4f8a73dee4
2019-03-15 17:23:28 -07:00