Commit Graph

8733 Commits

Author SHA1 Message Date
Automerger Merge Worker
86fbb8231c Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21
Change-Id: I72f00d09e74eb0de1d837a29a2b869a4de45178d
2020-03-16 05:53:15 +00:00
Aaron Huang
eb93e7de21 Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev 2020-03-16 05:47:34 +00:00
Automerger Merge Worker
77f57ba2c0 Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3 am: 36b22b0180
Change-Id: Ic4d1d7f7ce4bf8c6bf03fbe1da57216a8179bca9
2020-03-16 03:14:45 +00:00
Automerger Merge Worker
ceb5fe6225 [SP21] Address comments for API council review about aosp/1172143 am: f8660076c0 am: 893301ab1e
Change-Id: I86cf3b57722f64c0989ce606fde71d6173f812bb
2020-03-16 03:14:01 +00:00
Automerger Merge Worker
36b22b0180 Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3
Change-Id: Ief866c87b9e69b892fca435e8555080ffdad4af7
2020-03-16 03:05:06 +00:00
Automerger Merge Worker
893301ab1e [SP21] Address comments for API council review about aosp/1172143 am: f8660076c0
Change-Id: I8634d6f6ed65ec6b10009a90b147881fe1fc4530
2020-03-16 03:03:51 +00:00
Junyu Lai
cc8e8480b3 Merge "[SP21] Address comments for API council review about aosp/1172143" 2020-03-16 02:41:19 +00:00
Automerger Merge Worker
522734b78b Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf
Change-Id: I6aa3f7f9c0dfc63ebd7ffb3b38662af29d8f59cb
2020-03-16 02:15:17 +00:00
Automerger Merge Worker
de065b5eb8 Resolve ambiguous argument.
CTS tests don't have access to TestNetworkAgent and therefore
require overloading this method, which means 'null' is ambiguous.

Bug: 139268426
Test: FrameworksNetTests
Change-Id: I5d7deea82d7114fa38f37b90f94fe7e6073bd848
(cherry picked from commit ff83f1d7eea38c4143869cbf10dca5972421f6cd)
2020-03-15 12:56:05 +00:00
Automerger Merge Worker
b02c1d1ee2 [automerger skipped] Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1 -s ours
am skip reason: Change-Id Iea34a5c58a8b77c83258a39a8a44601e21a482f5 with SHA-1 6c65c01b1a is in history

Change-Id: Ie69348158857b989b25c3f7531de4d26f2b7965e
2020-03-15 03:04:27 +00:00
Mark Chien
239acdbbb1 Merge "Add javadoc for Network#netId" into rvc-dev 2020-03-15 02:53:29 +00:00
Automerger Merge Worker
a3ad53a2ab Merge "Resolve ambiguous argument." am: 947aa6c65d am: 4d7a85bd6f
Change-Id: Ie82a2f802331a9a42a4280fbbc91136fda284444
2020-03-14 04:13:58 +00:00
Automerger Merge Worker
4d7a85bd6f Merge "Resolve ambiguous argument." am: 947aa6c65d
Change-Id: I4c03bb6d16127929f4d60aa071aee18e8ac4c669
2020-03-14 03:52:51 +00:00
Chalard Jean
947aa6c65d Merge "Resolve ambiguous argument." 2020-03-14 03:38:01 +00:00
Automerger Merge Worker
239cd04817 Merge changes from topic "services.net-wifi" into rvc-dev am: 79a252687d
Change-Id: I16a2b101e0d613fcd0d194b42ffb599865632ba9
2020-03-13 22:54:14 +00:00
Roshan Pius
79a252687d Merge changes from topic "services.net-wifi" into rvc-dev
* changes:
  services.net: Add a static library needed by wifi module
  services.net: Use the new ModuleNetworkStackClient
2020-03-13 22:39:09 +00:00
Automerger Merge Worker
249a33427f Merge "Update Javadoc comments for ConnectivityDiagnostics constants." am: 082ec1d459 am: 5afb008614
Change-Id: I915de84881b04695b63769b270e6bddaeeceb1da
2020-03-13 19:49:45 +00:00
Automerger Merge Worker
5afb008614 Merge "Update Javadoc comments for ConnectivityDiagnostics constants." am: 082ec1d459
Change-Id: I279519ca5013c4109dee9f6860852d9b3a70776a
2020-03-13 19:34:01 +00:00
Cody Kesting
082ec1d459 Merge "Update Javadoc comments for ConnectivityDiagnostics constants." 2020-03-13 19:09:18 +00:00
Automerger Merge Worker
b4b65e0fc0 [automerger skipped] Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." into rvc-dev am: 4cab4ab5f2 -s ours
am skip reason: Change-Id I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4 with SHA-1 2abe611e5b is in history

Change-Id: I696493642b1431ca41e7e70210955055015c563a
2020-03-13 19:01:55 +00:00
Cody Kesting
4cab4ab5f2 Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." into rvc-dev 2020-03-13 18:44:50 +00:00
Roshan Pius
7cf9cb25e3 services.net: Add a static library needed by wifi module
Add a new static library that compiles against system_current which
includes all the parts needed by the wifi mainline module.

Also,
a) Refactored TcpKeepalivePacketData to use public APIs. The parcel
read/write methods in the base class are @hide and they're not used by
the other child class (NatKeepalivePacketData). So, remove the @hide
method from base class and use it direcly in the child class.
b) Add jar-jar rules for all the statically linked dependencies in wifi
service jar rules.

Exempt-From-Owner-Approval: Minor change on top of owner's approval.
Bug: 145825329
Test: Device boots up & connects to wifi networks.
Change-Id: Ifde69b579cfe5b813766f676acb10e436e64a44c
2020-03-13 14:42:09 +00:00
Chalard Jean
e82646b858 Resolve ambiguous argument.
CTS tests don't have access to TestNetworkAgent and therefore
require overloading this method, which means 'null' is ambiguous.

Bug: 139268426
Test: FrameworksNetTests
Change-Id: I9279718bde30bd98eff901921fb3411d22da72e5
2020-03-13 21:17:33 +09:00
Automerger Merge Worker
8c1c4277ed [automerger skipped] Merge "Remove redundant connected notification" am: 76c9cf8ae4 am: 774f58e0c7 -s ours
am skip reason: Change-Id Id11a9b99dd04772a92af8d527104906c47bf64cd with SHA-1 d539006438 is in history

Change-Id: Iade2e207778ff32c14d4be62980ea6c726799656
2020-03-13 07:48:09 +00:00
Automerger Merge Worker
774f58e0c7 Merge "Remove redundant connected notification" am: 76c9cf8ae4
Change-Id: I7e52f81e6b1d98480f9c851d861fa00a98729c6c
2020-03-13 07:30:45 +00:00
Treehugger Robot
76c9cf8ae4 Merge "Remove redundant connected notification" 2020-03-13 07:10:13 +00:00
Aaron Huang
e93348f00d Removing some of the API don't have to be @SystemApi
Some of the API we made @SystemApi won't be used by mainline
module. Removing these from the surface.

Bug: 151266974
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests
      atest FrameworksWifiTests

Change-Id: Ie30efa172f93a7557fb6ef56f4daf80e958c3787
2020-03-13 15:08:05 +08:00
Automerger Merge Worker
a3351ebec9 Merge "Add test for NetworkAgentConfig" am: 63ca656a6f am: 506cde0b44
Change-Id: Id1e27d793a1f8addf002fa5c42c4a0a8c4cbb828
2020-03-13 04:44:39 +00:00
Automerger Merge Worker
506cde0b44 Merge "Add test for NetworkAgentConfig" am: 63ca656a6f
Change-Id: I00936490e096c54cebc408a899a18c1dbf9e93ea
2020-03-13 04:32:04 +00:00
Aaron Huang
63ca656a6f Merge "Add test for NetworkAgentConfig" 2020-03-13 04:13:04 +00:00
Automerger Merge Worker
5b4b6d710d Add javadoc for Network#netId
Bug: 151156820
Test: m doc-comment-check-docs

Change-Id: I18e6022c7b0b8bf132069f33d916d1b16d53d4f0
Merged-In: Iea34a5c58a8b77c83258a39a8a44601e21a482f5
(cherry picked from commit ab23c0fef8c02a9d63b1b48628eb687f589aac72)
2020-03-13 02:31:30 +00:00
Roshan Pius
1ce72ca363 services.net: Use the new ModuleNetworkStackClient
Use the new ModuleNetworkStackClient to retrieve instances IpMemoryStore
& IpClient.

Bug: 145825329
Test: Compiles
Change-Id: I065525fdbd64b9509ef0f47bb35954d267c65fd2
2020-03-12 18:26:13 -07:00
Automerger Merge Worker
446f963890 [automerger skipped] Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" into rvc-dev am: aff8656fd2 -s ours
am skip reason: Change-Id I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33 with SHA-1 48dc409d46 is in history

Change-Id: I8336c3216fd0e81fe056a4b4bc95242ef708f422
2020-03-12 15:55:03 +00:00
junyulai
f8660076c0 [SP21] Address comments for API council review about aosp/1172143
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
2020-03-12 21:34:17 +08:00
Automerger Merge Worker
6259702dca Merge "Add javadoc for Network#netId" am: 12e8b300b0 am: c1fb643492
Change-Id: Ifcd5050d5d3499fece7fb359a6a4753333005e68
2020-03-12 10:30:05 +00:00
Automerger Merge Worker
c1fb643492 Merge "Add javadoc for Network#netId" am: 12e8b300b0
Change-Id: Ie59644d3f581b17856625409112eb5c5bd8d2aa4
2020-03-12 10:16:29 +00:00
Mark Chien
12e8b300b0 Merge "Add javadoc for Network#netId" 2020-03-12 09:55:18 +00:00
markchien
6c65c01b1a Add javadoc for Network#netId
Bug: 151156820
Test: m doc-comment-check-docs
Change-Id: Iea34a5c58a8b77c83258a39a8a44601e21a482f5
2020-03-12 09:54:44 +00:00
Automerger Merge Worker
8b080861a3 Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])
Bug: 149426063
Bug: 150640362
Test: atest CtsNetTestCasesLatestSdk:android.net.util.SocketUtilsTest
      on both Q and R devices
Change-Id: I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33
Merged-In: I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33
(cherry picked from aosp/1243868)
2020-03-12 01:45:22 +00:00
Automerger Merge Worker
e4fd7b20db Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" am: 07fb93026d am: 387bf88d47
Change-Id: I37b07d8d03cc359d18b576856453241a45fc2933
2020-03-11 10:43:39 +00:00
Automerger Merge Worker
387bf88d47 Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" am: 07fb93026d
Change-Id: Ieb04ad8b9d0d36840d61cf10585672deb797c911
2020-03-11 10:25:04 +00:00
Paul Hu
07fb93026d Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" 2020-03-11 09:50:26 +00:00
Automerger Merge Worker
ec3c61672e [automerger skipped] Merge "Skip Route tests that are R-specific on Q" into rvc-dev am: 3021e53984 -s ours
am skip reason: Change-Id Ibab9cfae0d35b26c6e4ca0defbb89769b04201d4 with SHA-1 e32fd54cfd is in history

Change-Id: Ib589de21534783aa7a41b59c5c88fb179f49391f
2020-03-11 09:42:52 +00:00
Chiachang Wang
3021e53984 Merge "Skip Route tests that are R-specific on Q" into rvc-dev 2020-03-11 09:36:23 +00:00
paulhu
48dc409d46 Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])
Bug: 149426063
Bug: 150640362
Test: atest CtsNetTestCasesLatestSdk:android.net.util.SocketUtilsTest
      on both Q and R devices
Change-Id: I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33
2020-03-11 15:20:26 +08:00
Automerger Merge Worker
8a7f9b575c [automerger skipped] Merge "Merge NetworkStatsService handler changes." into rvc-dev am: a49516676a -s ours
am skip reason: Change-Id If256ed4437ddcbcc72a6f766cff2f4cc512ee3f7 with SHA-1 3239fcbe45 is in history

Change-Id: Ie58da93cd3a7876d8dc56bbcff90bcfd0a38c9d3
2020-03-11 06:36:38 +00:00
Lorenzo Colitti
a49516676a Merge "Merge NetworkStatsService handler changes." into rvc-dev 2020-03-11 06:19:18 +00:00
Automerger Merge Worker
7ea7397f55 [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 5d427c44da -s ours am: 483cdb87ed -s ours
am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 21286d2018 is in history

Change-Id: I23421daf88854b4515d8532268afe77dc6ee0ba0
2020-03-11 04:55:24 +00:00
Automerger Merge Worker
483cdb87ed [automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 5d427c44da -s ours
am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 21286d2018 is in history

Change-Id: I88ef318934572883b59615bd6a1644a5f658842b
2020-03-11 04:35:01 +00:00
Aaron Huang
5d427c44da Merge "Remove framework code that has moved to frameworks/libs/net" 2020-03-11 04:22:09 +00:00