Commit Graph

6462 Commits

Author SHA1 Message Date
Luke Huang
df7d47d182 Merge "Cleanup NetworkManagementService for Netd commnads binder migrartion" 2019-03-21 06:01:25 +00:00
paulhu
cbbc3db924 Fix Automated API Review issues.
1. Some API's argument/return value must be marked either
@NonNull or @Nullable.
2. Change some system APIs to public APIs.
3. Modify the method name

Bug: 126700123
Bug: 126702339
Bug: 126699682
Bug: 118296575
Bug: 126699216
Bug: 126699675
Bug: 126699429
Bug: 126699193
Bug: 123586045
Test: atest FrameworksNetTests
Change-Id: Iaa2832cdcf83758ed0fec81b954a0c63bc5a7bf6
2019-03-21 13:55:37 +08:00
Lucas Lin
5026c330f2 Merge "Improve partial connectivity" am: 8d77a4b813 am: a3ab397e1f
am: 4569a46522

Change-Id: I25f9d056c26bf947c2e09516da51b627c3da9685
2019-03-20 21:15:34 -07:00
Lucas Lin
4569a46522 Merge "Improve partial connectivity" am: 8d77a4b813
am: a3ab397e1f

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

Change-Id: I19c41c88d32643f82531c7afc3d4248ef9b44b53
2019-03-20 20:45:42 -07:00
Lucas Lin
8d77a4b813 Merge "Improve partial connectivity" 2019-03-21 03:34:30 +00:00
markchien
458c95b9ff Replace TcpSocketInfo with similar structure
Replace TcpSocketInfo with TcpKeepalivePacketDataParcelable
because their structures are very similar.

bug: 128882321
Test: -build, flash, boot
      -FrameworksNetTests

Change-Id: Iafb4031a64ba4775a495c156e2c997d890c6b261
2019-03-20 22:29:48 +08:00
markchien
7f2cd7d5e7 Restrict scope of switch Repair Mode
Bug: 123969339
Test: -boot, flash
      -atest FrameworksNetTests

Change-Id: Ie0fb685be5f7a2d06544065d67c605d87a19ff2f
2019-03-20 22:20:56 +08:00
Luke Huang
ca5270422a 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
cee6797b6a [automerger skipped] Merge changes from topic "framework-no-networkstack-aidl" am: 6505a76d78 am: b02b932f46
am: a3acf96920 -s ours
am skip reason: change_id I74531ef11d504b232d4f377532d5e0812dbc88db with SHA1 59d474b3c2 is in history

Change-Id: I694f5e54fba6ddc7a9f486b09ddaeaf54d50e9d1
2019-03-20 04:03:21 -07:00
Lorenzo Colitti
4146c1d2c7 [automerger skipped] Move TcpKeepalivePacketData out of the framework. am: 82f2a72d01 am: 63a7fe7a9b
am: 48c1555d3c -s ours
am skip reason: change_id Ib2805f7fcc516a5f6989c252365d1c95b8042703 with SHA1 47002ed0d1 is in history

Change-Id: I844cf9813437afda3c835b087607a5ef2b38dc42
2019-03-20 03:55:40 -07:00
Lorenzo Colitti
023fb4b389 [automerger skipped] Stop using netd parcelables in the framework. am: 15c035c790 am: 1ff78aca03
am: cb48b152fa -s ours
am skip reason: change_id I027d50ba56091f5558f45e6e08f32e5912b2a82a with SHA1 86b51bb8a4 is in history

Change-Id: Iafb073f81f528a0bf3ec750a348ea7ada190e245
2019-03-20 03:49:36 -07:00
Lorenzo Colitti
a3acf96920 Merge changes from topic "framework-no-networkstack-aidl" am: 6505a76d78
am: b02b932f46

Change-Id: Ie5e1e5fce574ca993b1ec2a998f49f9201c59b4d
2019-03-20 03:38:52 -07:00
Lorenzo Colitti
48c1555d3c Move TcpKeepalivePacketData out of the framework. am: 82f2a72d01
am: 63a7fe7a9b

Change-Id: I5f90bdf3993c472f5564164e17106d2a59233656
2019-03-20 03:32:50 -07:00
Lorenzo Colitti
cb48b152fa Stop using netd parcelables in the framework. am: 15c035c790
am: 1ff78aca03

Change-Id: I5a8e45d669f36dfdc67b9f9533d0ff6a24e8f27c
2019-03-20 03:28:08 -07:00
lucaslin
f9bff5b0dc 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
b02b932f46 Merge changes from topic "framework-no-networkstack-aidl"
am: 6505a76d78

Change-Id: I13ba3cb016a63353cfa62a61106d16e30eff0076
2019-03-20 03:18:47 -07:00
Lorenzo Colitti
63a7fe7a9b Move TcpKeepalivePacketData out of the framework.
am: 82f2a72d01

Change-Id: I7657e6827299ad398bc16bc792150fd901226b4d
2019-03-20 03:11:11 -07:00
Lorenzo Colitti
1ff78aca03 Stop using netd parcelables in the framework.
am: 15c035c790

Change-Id: Ic4ac445c582ff8b55d253d99de6750d250e9d9e5
2019-03-20 03:03:27 -07:00
Lorenzo Colitti
6505a76d78 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
6ea60d7016 Merge "Add documentation for CaptivePortal APP_RETURN_*" am: 3886def4fa am: c168c30849
am: befedce6dd

Change-Id: I2fce43bf23ac9689f69bc2c432b3032cc9abb7d9
2019-03-19 23:13:15 -07:00
Remi NGUYEN VAN
befedce6dd Merge "Add documentation for CaptivePortal APP_RETURN_*" am: 3886def4fa
am: c168c30849

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

Change-Id: Idc55c5c729e2a66ad845dbc8ddaf97580c7ae8cc
2019-03-19 22:53:43 -07:00
Remi NGUYEN VAN
3886def4fa Merge "Add documentation for CaptivePortal APP_RETURN_*" 2019-03-20 05:40:41 +00:00
Remi NGUYEN VAN
b71b242e7e Merge "Add Parcelable implementation for ApfCapabilities" am: d64b329979 am: 57b7aa8ec2
am: 84890d80e0

Change-Id: I4d878b8dc0928aca47f944050becaa4d5206e336
2019-03-19 18:09:23 -07:00
Remi NGUYEN VAN
84890d80e0 Merge "Add Parcelable implementation for ApfCapabilities" am: d64b329979
am: 57b7aa8ec2

Change-Id: Iecec6a6376e2ff64d24813dbdb5b958f6968d627
2019-03-19 17:59:22 -07:00
Remi NGUYEN VAN
57b7aa8ec2 Merge "Add Parcelable implementation for ApfCapabilities"
am: d64b329979

Change-Id: I218b583755259a8c0824777c3247a090bdbd348b
2019-03-19 17:51:34 -07:00
Remi NGUYEN VAN
d64b329979 Merge "Add Parcelable implementation for ApfCapabilities" 2019-03-20 00:34:53 +00:00
Lorenzo Colitti
82f2a72d01 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
15c035c790 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
2c7e5e9b2f [automerger skipped] Merge "Add uid information in PackageListObserver" am: 4376896ea9 am: 5b3a644227
am: e046bf1f5f -s ours
am skip reason: change_id I2bd4bdf924687960a4fa3a47235bae68d885e445 with SHA1 9d4479a4f4 is in history

Change-Id: Ie05eba316be7bf44fb06706f3e3457dffbf729a7
2019-03-19 15:08:07 -07:00
Chenbo Feng
e046bf1f5f Merge "Add uid information in PackageListObserver" am: 4376896ea9
am: 5b3a644227

Change-Id: I61f46bf443c2027ed70a884f0cbb3ede80a8c1f3
2019-03-19 14:53:10 -07:00
Chenbo Feng
5b3a644227 Merge "Add uid information in PackageListObserver"
am: 4376896ea9

Change-Id: I4fef26fed802902d6a69563c19704a94916ff834
2019-03-19 14:42:14 -07:00
Treehugger Robot
4376896ea9 Merge "Add uid information in PackageListObserver" 2019-03-19 21:19:16 +00:00
Varun Anand
b5d1b24eb0 Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 43c87768e0 am: 5df3d62d01
am: 12f4d3d7e3

Change-Id: I80e3ebb556ac0b6bff5d232b881f7d869cb74f00
2019-03-19 09:47:04 -07:00
Varun Anand
12f4d3d7e3 Merge "Add unit tests related to data accounting for VPNs with one underlying network." am: 43c87768e0
am: 5df3d62d01

Change-Id: I7ab73884266bc4b64d1914557a29e84fc4de431e
2019-03-19 09:37:37 -07:00
Varun Anand
5df3d62d01 Merge "Add unit tests related to data accounting for VPNs with one underlying network."
am: 43c87768e0

Change-Id: I91971112870c7a3a2d4786c25125204de7e008f5
2019-03-19 09:28:22 -07:00
Treehugger Robot
43c87768e0 Merge "Add unit tests related to data accounting for VPNs with one underlying network." 2019-03-19 16:18:28 +00:00
Lorenzo Colitti
47002ed0d1 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
2019-03-20 00:49:33 +09:00
Lorenzo Colitti
86b51bb8a4 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
2019-03-20 00:49:32 +09:00
Xiao Ma
cefa778aa4 Merge "Move the IpMemoryStore to the network stack." am: edb899fcf8 am: 61e928c7cd
am: 78e3f9ab7d

Change-Id: I243056012d2f099d96a33657c0eb63a5b66a2cfe
2019-03-19 06:54:43 -07:00
Xiao Ma
78e3f9ab7d Merge "Move the IpMemoryStore to the network stack." am: edb899fcf8
am: 61e928c7cd

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

Change-Id: I672d07ca2d0a251c246993ab8c7c3075de385570
2019-03-19 06:35:31 -07:00
Xiao Ma
edb899fcf8 Merge "Move the IpMemoryStore to the network stack." 2019-03-19 13:21:12 +00:00
Remi NGUYEN VAN
18017cb6d1 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
9c21fcd7f6 Merge "Replace Handler with Executor for async DNS API" am: 21be4d297c am: 699127bae2
am: cadce1355b

Change-Id: Ia2305094fe66017fbdfdc18b2c7284452ac90036
2019-03-18 23:40:49 -07:00
Luke Huang
cadce1355b Merge "Replace Handler with Executor for async DNS API" am: 21be4d297c
am: 699127bae2

Change-Id: I40ce45d039e01f831b6f4f50ed360a2a206a1146
2019-03-18 23:25:58 -07:00
Luke Huang
bcee2f4588 Merge "Refactor answer callback for async DNS query JAVA API" am: 2b474c454f am: 5f80d53df8
am: d54dc33070

Change-Id: Id4d0ae87b1ac8618c28da666619c5c5b5bd2d722
2019-03-18 23:24:06 -07:00
Luke Huang
d54dc33070 Merge "Refactor answer callback for async DNS query JAVA API" am: 2b474c454f
am: 5f80d53df8

Change-Id: I7538b247c5bd84d7f5b21be11b9bb1940fb9ba5a
2019-03-18 23:09:58 -07:00
Luke Huang
699127bae2 Merge "Replace Handler with Executor for async DNS API"
am: 21be4d297c

Change-Id: I5fb0d659d27894ca9f243654f9283764f1369745
2019-03-18 23:05:15 -07:00