Remi NGUYEN VAN
543ecddcdc
Merge "Add tests to services/tests/net test mapping"
2020-01-30 06:20:39 +00:00
markchien
e1322a8a8e
NetworkAgent: Fix doc build fail by invalid tag
...
Bug: 138306002
Bug: 139268426
Test: make doc-comment-check-docs
Change-Id: I8b8df5096b90ad10545087ab09f68ecae637aa35
Merged-In: I8b8df5096b90ad10545087ab09f68ecae637aa35
2020-01-30 03:37:45 +00:00
sqian
d60481ce20
Make most of NetworkAgent @SystemApi.
...
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Test: atest android.net.cts.ConnectivityManagerTest
Change-Id: I856f01f02c35c2f6a886d8b98039e5dfbc48148b
Merged-In: I856f01f02c35c2f6a886d8b98039e5dfbc48148b
(cherry picked from commit 980ed12f7f )
2020-01-29 16:45:03 -08:00
Automerger Merge Worker
70250dc8e8
[automerger skipped] Merge "API changes for IPv6 MTU support" am: b36aaf9fae am: 4d085e38ec am: 2829a42117 -s ours
...
am skip reason: Change-Id I43c7e088e46e40f38d8114548e0fc4e39d7f91cb with SHA-1 d30bfe0174 is in history
Change-Id: Ia8b26d50299dfb07178d0adef52cc422317070e9
2020-01-29 16:59:42 +00:00
Automerger Merge Worker
2829a42117
Merge "API changes for IPv6 MTU support" am: b36aaf9fae am: 4d085e38ec
...
Change-Id: I08a8a0800d11a643281775d2f9dea5d13334c8f7
2020-01-29 16:37:38 +00:00
Sarah Chin
4d085e38ec
Merge "API changes for IPv6 MTU support"
...
am: b36aaf9fae
Change-Id: I80f206245b9340a9df8b65c0e42413617eecadfb
2020-01-29 08:08:45 -08:00
Sarah Chin
b36aaf9fae
Merge "API changes for IPv6 MTU support"
2020-01-29 15:56:09 +00:00
Sarah Chin
f75d09fac1
API changes for IPv6 MTU support
...
Change mtu->mtuV4 and add mtuV6 for DataProfile and DataCallResult
Add mtu to RouteInfo and update test
Test: atest FrameworksTelephonyTests
Bug: 146668814
Change-Id: I43c7e088e46e40f38d8114548e0fc4e39d7f91cb
Merged-In: I43c7e088e46e40f38d8114548e0fc4e39d7f91cb
2020-01-30 00:17:19 +09:00
Chalard Jean
0c7b9a9eb7
[NS A27] Remove useless logs and a useless var
...
These logs haven't found a bug in a long time and we now have
some structural guarantees that the conditions they check for
can't happen (like the checks that everything is happening on
the same thread).
Maybe we'll reinstate similar checks later, but for now they
are in the way and removing them is a small sacrifice for the
intended benefit.
The local was simply not used any more.
Test: FrameworksNetTests
Change-Id: If8c8d1f3eb883ffcf0fbdb70824b87dd70da507c
2020-01-29 19:47:16 +09:00
Chalard Jean
d8bea3bb90
[NS A26] Move available callbacks out of the rematch computation
...
Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: I3a804a9f6eaf50a3995eaaf6469a1c2b9387be14
2020-01-29 19:47:11 +09:00
Automerger Merge Worker
9356f926cd
[automerger skipped] Merge "Add implementation of getInterfaceHash()" am: bc2cbc7499 am: 8a0d3e5cdf am: 48af443a18 -s ours
...
am skip reason: Change-Id I314f19aeca82cc8653eab71c9526ea7a208e6b50 with SHA-1 ead2e7bbb1 is in history
Change-Id: I5410c6c461d1dc78d2722a3d9f0d6c9b31376b17
2020-01-29 05:47:27 +00:00
Automerger Merge Worker
48af443a18
Merge "Add implementation of getInterfaceHash()" am: bc2cbc7499 am: 8a0d3e5cdf
...
Change-Id: I4232678f9f597e132b11556343ea7a6cd3406769
2020-01-29 05:28:30 +00:00
Paul Trautrim
8a0d3e5cdf
Merge "Add implementation of getInterfaceHash()"
...
am: bc2cbc7499
Change-Id: I4d69160572a16e8095e31e641d516f322941da7d
2020-01-28 21:19:13 -08:00
Paul Trautrim
bc2cbc7499
Merge "Add implementation of getInterfaceHash()"
2020-01-29 05:12:12 +00:00
Paul Trautrim
79a9c8cd76
Add implementation of getInterfaceHash()
...
Exempt-From-Owner-Approval: cherry-pick from internal
Bug: 136065010
Test: m
Change-Id: I314f19aeca82cc8653eab71c9526ea7a208e6b50
Merged-In: I314f19aeca82cc8653eab71c9526ea7a208e6b50
2020-01-29 14:09:56 +09:00
Paul Trautrim
ead2e7bbb1
Add implementation of getInterfaceHash()
...
Bug: 136065010
Test: m
Change-Id: I314f19aeca82cc8653eab71c9526ea7a208e6b50
2020-01-28 10:33:11 +09:00
David Su
c19c94fe9b
Networking: Rename removeDoubleQuotes to sanitizeSsid
...
Bug: 145745815
Test: compiles
Change-Id: Iaa6f0d65cab556c24b0a9010427de8e6a02836c1
2020-01-27 13:52:26 -08:00
David Su
0a4391d4f3
Networking: Rename removeDoubleQuotes to sanitizeSsid
...
Bug: 145745815
Test: compiles
Change-Id: Iaa6f0d65cab556c24b0a9010427de8e6a02836c1
Merged-In: Iaa6f0d65cab556c24b0a9010427de8e6a02836c1
(clean cherry-pick from internal branch)
2020-01-27 13:51:56 -08:00
Automerger Merge Worker
506d1bce91
[automerger skipped] Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a am: 055202128f am: f21eb55362 am: 3fba868d69 -s ours
...
am skip reason: Change-Id I0ac8c022f70cdf9305c183996c2464a8e04ba5ae with SHA-1 b67261b01c is in history
Change-Id: Ifd8c1689565b3f0c3dbd4ba083255b5fba22142e
2020-01-27 07:03:25 +00:00
Automerger Merge Worker
3fba868d69
Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a am: 055202128f am: f21eb55362
...
Change-Id: I0714a642766e8d6624ff2bc856c6f77c900fa814
2020-01-27 06:56:38 +00:00
Jack Yu
f21eb55362
Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a
...
am: 055202128f
Change-Id: I45158becd88d1e38f492a3ad5023aa96fae5ccd3
2020-01-26 22:50:05 -08:00
Treehugger Robot
055202128f
Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a
...
* changes:
Fixed the documentation and unit tests
Disabled the tests
Added expiration time and deprecation time support
2020-01-27 06:39:38 +00:00
Jack Yu
d956e5b326
Fixed the documentation and unit tests
...
Fixed the documentation and re-eanble the
broken unit tests.
Test: LinkAddressTest
Bug: 142949345
Merged-In: I0ac8c022f70cdf9305c183996c2464a8e04ba5ae
Change-Id: I0ac8c022f70cdf9305c183996c2464a8e04ba5ae
(cherry picked from commit b67261b01c )
2020-01-26 21:37:36 -08:00
Jack Yu
632771fd43
Disabled the tests
...
Will re-enable after fixing the negative time issue
Test: LinkAddressTest
Bug: 148257086
Merged-In: Ia6ce0608a2ce95be980e4f9ea62315076c4453be
Change-Id: Ia6ce0608a2ce95be980e4f9ea62315076c4453be
(cherry picked from commit d40e5498d0 )
2020-01-26 21:34:00 -08:00
Jack Yu
590d408a06
Added expiration time and deprecation time support
...
Added link address deprecation time and expiration
time for SSC mode 3 support.
Bug: 135717900
Bug: 142949345
Test: LinkAddressTest
Merged-In: Ibc030d2a70ded66e00dd3bdae209609b9118de78
Change-Id: Ibc030d2a70ded66e00dd3bdae209609b9118de78
(cherry picked from commit 05d5b3b59f )
2020-01-26 21:32:12 -08:00
Jack Yu
b67261b01c
Fixed the documentation and unit tests
...
Fixed the documentation and re-eanble the
broken unit tests.
Test: LinkAddressTest
Bug: 142949345
Change-Id: I0ac8c022f70cdf9305c183996c2464a8e04ba5ae
2020-01-26 16:01:28 -08:00
Automerger Merge Worker
078a1426d9
[automerger skipped] Merge "Fix javadoc build break s/line/link/" am: 08efffc46e am: 1b1d0eb844 am: f70da490ac -s ours
...
am skip reason: Change-Id I9df208a9b063b71b2f6cc3099005d1ab38044cd2 with SHA-1 5cfe856af1 is in history
Change-Id: I4051342bd696bdc440b3a7ceeeef62ea9b47723d
2020-01-24 19:06:53 +00:00
Automerger Merge Worker
f70da490ac
Merge "Fix javadoc build break s/line/link/" am: 08efffc46e am: 1b1d0eb844
...
Change-Id: I2debe1dca84bbe175be89686f746bf19f785dda9
2020-01-24 18:57:25 +00:00
Cody Kesting
1b1d0eb844
Merge "Fix javadoc build break s/line/link/"
...
am: 08efffc46e
Change-Id: Iba1f8ec62784f68bc415690ccf5966445c9b3542
2020-01-24 10:55:47 -08:00
Automerger Merge Worker
ca9f47ace7
Merge "Add API for apps to check if they are the network owner" am: 78433a68ee am: 3836f2f7cb am: 091626b927
...
Change-Id: Ibe4cc2bd1d588dcbccd83f53ee3da9d067ae85b6
2020-01-24 18:47:28 +00:00
Cody Kesting
08efffc46e
Merge "Fix javadoc build break s/line/link/"
2020-01-24 18:37:51 +00:00
Automerger Merge Worker
091626b927
Merge "Add API for apps to check if they are the network owner" am: 78433a68ee am: 3836f2f7cb
...
Change-Id: Ifbcc5782a2413ec455896af52a9ac26bc3cda82c
2020-01-24 18:35:13 +00:00
Qingxi Li
3836f2f7cb
Merge "Add API for apps to check if they are the network owner"
...
am: 78433a68ee
Change-Id: I1316c7fccd9b7a35ff6d8a79a8afa13644d9ab54
2020-01-24 10:24:12 -08:00
Qingxi Li
78433a68ee
Merge "Add API for apps to check if they are the network owner"
2020-01-24 18:12:52 +00:00
Nathan Harold
74f0fb8d4e
Fix javadoc build break s/line/link/
...
Bug: 148248781
Test: compilation
Change-Id: I9df208a9b063b71b2f6cc3099005d1ab38044cd2
Merged-in: I9df208a9b063b71b2f6cc3099005d1ab38044cd2
2020-01-24 09:43:03 -08:00
Qingxi Li
bb8da980ae
Add API for apps to check if they are the network owner
...
This CL extends NetworkCapabilities#mEstablishingVpnAppUid
to the network owner app UID and introduces a new public API
to get this owner app's UID.
Bug: 142072839
Test: atest FrameworksNetTests
Change-Id: Id83cdea62b89b586aff74e51e3fee60e53d37d4c
2020-01-24 17:28:23 +00:00
Automerger Merge Worker
d164fea641
Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 680cce79b9 am: 346cc58d29 am: 7c0628505b
...
Change-Id: Iec4dcf4c39edb8994ed72b9550845ea5962e836a
2020-01-24 17:16:19 +00:00
Automerger Merge Worker
0461816497
Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: 54600d7b00 am: f94fb42850 am: 1d7b1dddd4
...
Change-Id: I5a77211d1f940166c02c4aac31c9add9466c76b1
2020-01-24 17:15:46 +00:00
Automerger Merge Worker
f0ee99f694
[automerger skipped] Merge changes I7065d081,Ic7c3a331,Ia432057b am: 6a0bafdb58 am: 14ea3431d0 am: f24de20769 -s ours
...
am skip reason: Change-Id I7065d081c11bc606d691f76ac8b499dd075d6504 with SHA-1 de933af7a7 is in history
Change-Id: Ifa5a0b23acc51bc01d480046a4354376083ff84a
2020-01-24 17:15:22 +00:00
Automerger Merge Worker
ea0f58822f
[automerger skipped] Allows the caller to specify configuration by TetheringRequest am: 91c78e57df am: a64e1cce4e am: 6cbe1d92ee -s ours
...
am skip reason: Change-Id Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3 with SHA-1 d19ef10d00 is in history
Change-Id: I036e4263a187c92c88c7fc3d33484efd6b687fcb
2020-01-24 17:15:06 +00:00
Automerger Merge Worker
8a09924681
[automerger skipped] Make TetheringManager to system API am: 6ae63e5232 am: 5ea28ce6d3 am: 468e105b9e -s ours
...
am skip reason: Change-Id Ia432057bf9056727c4a0ca97d160a49274d33581 with SHA-1 5058987bd7 is in history
Change-Id: Ic852b8740f89c0107c770375fbae6f00e96a31c4
2020-01-24 17:15:03 +00:00
Automerger Merge Worker
7c0628505b
Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 680cce79b9 am: 346cc58d29
...
Change-Id: Iaa36b7036d916ef7a48314a3dfa224750e720c62
2020-01-24 16:50:29 +00:00
Automerger Merge Worker
1d7b1dddd4
Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: 54600d7b00 am: f94fb42850
...
Change-Id: I771e82db91ed72b5263c1ea73a4b36f85e9f4e61
2020-01-24 16:50:19 +00:00
Automerger Merge Worker
f24de20769
Merge changes I7065d081,Ic7c3a331,Ia432057b am: 6a0bafdb58 am: 14ea3431d0
...
Change-Id: I801b7f351988322648108a15f7e5d06a47d3a102
2020-01-24 16:49:47 +00:00
Automerger Merge Worker
6cbe1d92ee
Allows the caller to specify configuration by TetheringRequest am: 91c78e57df am: a64e1cce4e
...
Change-Id: Icb6d93cc76b7d5511ec0c556c0ed512198bfb781
2020-01-24 16:49:44 +00:00
Automerger Merge Worker
468e105b9e
Make TetheringManager to system API am: 6ae63e5232 am: 5ea28ce6d3
...
Change-Id: Iabb947b90eaaedbce30478e4294823acce085cdb
2020-01-24 16:49:41 +00:00
Automerger Merge Worker
346cc58d29
Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 680cce79b9
...
Change-Id: I5e53fec27728a65e05c7fdf7501dee1052c52e78
2020-01-24 16:39:47 +00:00
Automerger Merge Worker
f94fb42850
Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: 54600d7b00
...
Change-Id: I1d60026a7b31af2bc329187685780744c20d7c8c
2020-01-24 16:39:32 +00:00
Automerger Merge Worker
14ea3431d0
Merge changes I7065d081,Ic7c3a331,Ia432057b am: 6a0bafdb58
...
Change-Id: I1e5d79606f63540f2d9ae3187057e2ba84f4dcb8
2020-01-24 16:38:56 +00:00
Automerger Merge Worker
a64e1cce4e
Allows the caller to specify configuration by TetheringRequest am: 91c78e57df
...
Change-Id: I2595221b08eb389dcbe8643f3839707a15bc6ac0
2020-01-24 16:38:45 +00:00