Automerger Merge Worker
8484d92f7d
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 am: b464fd2143
...
Change-Id: I028e1c3f4d0ea78669f2b8a4188a0d4064dfa007
2020-03-16 06:08:04 +00:00
Automerger Merge Worker
12a828d5f3
[automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 -s ours am: 1db8a8251f -s ours
...
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 4493983bbd is in history
Change-Id: I96b83022f7ef1e9e4f12fdd806d62da5e1f08738
2020-03-16 06:03:38 +00:00
Automerger Merge Worker
57b9e58b89
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21 am: 86fbb8231c
...
Change-Id: I2812019cd89e700adeb3a5e79bf18d8d9985026b
2020-03-16 06:03:30 +00:00
Automerger Merge Worker
b464fd2143
Merge "Removing some of the API don't have to be @SystemApi" into rvc-dev am: eb93e7de21
...
Change-Id: I1c34bf3459158578949ad665fcce3cff7d15e353
2020-03-16 05:53:53 +00:00
Automerger Merge Worker
1db8a8251f
[automerger skipped] Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev am: 46a3b708b2 -s ours
...
am skip reason: Change-Id Id22113aa0db01244817b4b008f5573c5e7b317f0 with SHA-1 4493983bbd is in history
Change-Id: I0a46cc19cb5cfb0a90a96299f48195ab2e2c836f
2020-03-16 05:53:38 +00:00
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
Paul Hu
46a3b708b2
Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider" into rvc-dev
2020-03-16 05:48:33 +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
f408ea33ff
Merge "[SP21] Address comments for API council review about aosp/1172143" am: cc8e8480b3 am: 36b22b0180 am: 77f57ba2c0
...
Change-Id: I5c77bcd0a95e51c91c306981c5f396f445da5ab8
2020-03-16 03:39:33 +00:00
Automerger Merge Worker
15ac97e669
[SP21] Address comments for API council review about aosp/1172143 am: f8660076c0 am: 893301ab1e am: ceb5fe6225
...
Change-Id: I9c44371665dc09612357a5ef880364bc32824784
2020-03-16 03:39:03 +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
1635cbf50d
Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf am: 522734b78b
...
Change-Id: I0893adb924499a1efcf544d7bd1a2ffe2c9087fe
2020-03-16 02:29:20 +00:00
Automerger Merge Worker
4df691d2f7
Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf am: 9889ee4fe1
...
Change-Id: Ibfac233f986c6bc249f604a3f90a48e889da2a36
2020-03-16 02:28:53 +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
9889ee4fe1
Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf
...
Change-Id: I42d8dcfd819d21e87679746f50303adf378298cc
2020-03-16 02:14:58 +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
aa0debb1b5
[automerger skipped] Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1 -s ours am: b02c1d1ee2 -s ours
...
am skip reason: Change-Id Iea34a5c58a8b77c83258a39a8a44601e21a482f5 with SHA-1 6c65c01b1a is in history
Change-Id: Ia6bfdffbc44c1804e52094a07f4beda0d17aab62
2020-03-15 03:19:11 +00:00
Automerger Merge Worker
be9795f9ce
[automerger skipped] Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1 am: b1b6a59bce -s ours
...
am skip reason: Change-Id Iea34a5c58a8b77c83258a39a8a44601e21a482f5 with SHA-1 6c65c01b1a is in history
Change-Id: Ie13b56b44a5d959dbfb4f3231b20332fbf5c3da7
2020-03-15 03:18:52 +00:00
Automerger Merge Worker
b1b6a59bce
Merge "Add javadoc for Network#netId" into rvc-dev am: 239acdbbb1
...
Change-Id: I1095996e36241eb0a42598aa737322610767599f
2020-03-15 03:04:40 +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
f6fece2d31
Merge "Resolve ambiguous argument." am: 947aa6c65d am: 4d7a85bd6f am: a3ad53a2ab
...
Change-Id: I1825a198c1643c70de97c6f078cf5a8ed05df7f8
2020-03-14 04:33:47 +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
683e1c00f1
Merge changes from topic "services.net-wifi" into rvc-dev am: 79a252687d am: 239cd04817
...
Change-Id: I14fb14fa12bfe85934214cf192defdd597a9867d
2020-03-13 23:11:11 +00:00
Automerger Merge Worker
4c72df4819
Merge changes from topic "services.net-wifi" into rvc-dev am: 79a252687d am: 7c138deb9b
...
Change-Id: I565c7cce87e0dccc4b0692e7411918bb2db6bf7b
2020-03-13 23:10:56 +00:00
Automerger Merge Worker
68a392112b
services.net: Use the new ModuleNetworkStackClient am: 1ce72ca363 am: 1411a48409
...
Change-Id: I5243007628a12fc10449298d11893c5492c4fe6d
2020-03-13 23:10:52 +00:00
Automerger Merge Worker
7c138deb9b
Merge changes from topic "services.net-wifi" into rvc-dev am: 79a252687d
...
Change-Id: I6da73de3e0d9605a072d04509d9e0488a86ba749
2020-03-13 22:54:54 +00:00
Automerger Merge Worker
1411a48409
services.net: Use the new ModuleNetworkStackClient am: 1ce72ca363
...
Change-Id: I9ef3ec22d6924d43087b975914baf6055e88cf4d
2020-03-13 22:54:51 +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
16d5406986
Merge "Update Javadoc comments for ConnectivityDiagnostics constants." am: 082ec1d459 am: 5afb008614 am: 249a33427f
...
Change-Id: Ifbcfdab0f1fb976e471e58dccde09538af4d15f7
2020-03-13 20:10:10 +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
bceddfb2ca
Merge "[automerger skipped] Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." into rvc-dev am: 4cab4ab5f2 -s ours" into rvc-dev-plus-aosp am: ad7ed8769a -s ours
...
am skip reason: Change-Id I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4 with SHA-1 33325fe622 is in history
Change-Id: I03bd873e8396994a03ca79cbcc272b4f58d1c7ea
2020-03-13 19:04:22 +00:00
Automerger Merge Worker
450c68122f
[automerger skipped] Merge "Clear UIDs when sharing NetworkCapabilties for ConnectivityDiagnostics." into rvc-dev am: 4cab4ab5f2 am: bfb42aca28 -s ours
...
am skip reason: Change-Id I5bde5a8116f7e36b8f4de49adf4cab8ec45a5aa4 with SHA-1 2abe611e5b is in history
Change-Id: Ib35a6b7a91bc578d73c6bc2c2dde4a6c6ae04578
2020-03-13 19:03:23 +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
5f306cde2c
[automerger skipped] Merge "Remove redundant connected notification" am: 76c9cf8ae4 am: 774f58e0c7 -s ours am: 8c1c4277ed -s ours
...
am skip reason: Change-Id Id11a9b99dd04772a92af8d527104906c47bf64cd with SHA-1 d539006438 is in history
Change-Id: I415e6023f30cdedc0c7c8eed2bf4f8afe238aa92
2020-03-13 08:07:03 +00: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