Automerger Merge Worker
60334bf537
[automerger skipped] Make most of NetworkAgent @SystemApi. am: 298b1ebbf6 am: cb4da50356 am: 16fe2252bc -s ours
...
am skip reason: Change-Id I856f01f02c35c2f6a886d8b98039e5dfbc48148b with SHA-1 10a12966c2 is in history
Change-Id: I9d1f5297925972196fd8bb21afa58f5a1a12ddfd
2020-01-31 16:31:00 +00:00
Automerger Merge Worker
16fe2252bc
Make most of NetworkAgent @SystemApi. am: 298b1ebbf6 am: cb4da50356
...
Change-Id: I3119a05b9db4716cc7c78a7537ecc89a56e88264
2020-01-31 16:28:40 +00:00
Automerger Merge Worker
cb4da50356
Make most of NetworkAgent @SystemApi. am: 298b1ebbf6
...
Change-Id: Ie36bfb9a1bed114fe628ad6c1b935d587cc3160d
2020-01-31 16:25:20 +00:00
Chalard Jean
5f8f467f44
Merge "Add public fields to NetworkScore and make it @SystemApi"
2020-01-31 03:06:16 +00:00
David Su
e89caf232d
Merge changes from topic "api-review-removedoublequotes"
...
* changes:
SettingsLib: Rename removeDoubleQuotes to sanitizeSsid
Networking: Rename removeDoubleQuotes to sanitizeSsid
Wifi: Rename removeDoubleQuotes to sanitizeSsid
2020-01-30 18:16:53 +00:00
Chalard Jean
a9727279ae
Add public fields to NetworkScore and make it @SystemApi
...
Bug: 113554781
Bug: 146583853
Test: FrameworksNetTests
Change-Id: I19d965c0146196cb67b3417eb1790ccd90ce3233
2020-01-30 18:45:52 +09:00
sqian
298b1ebbf6
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 10a12966c2 )
2020-01-29 16:45:03 -08:00
Automerger Merge Worker
e7af61daca
[automerger skipped] Merge "API changes for IPv6 MTU support" am: 16cea243ab am: 96ec4a9377 am: 9071679de1 -s ours
...
am skip reason: Change-Id I43c7e088e46e40f38d8114548e0fc4e39d7f91cb with SHA-1 50169af6ad is in history
Change-Id: Ia8b26d50299dfb07178d0adef52cc422317070e9
2020-01-29 16:59:42 +00:00
Automerger Merge Worker
9071679de1
Merge "API changes for IPv6 MTU support" am: 16cea243ab am: 96ec4a9377
...
Change-Id: I08a8a0800d11a643281775d2f9dea5d13334c8f7
2020-01-29 16:37:38 +00:00
Sarah Chin
96ec4a9377
Merge "API changes for IPv6 MTU support"
...
am: 16cea243ab
Change-Id: I80f206245b9340a9df8b65c0e42413617eecadfb
2020-01-29 08:08:45 -08:00
Sarah Chin
16cea243ab
Merge "API changes for IPv6 MTU support"
2020-01-29 15:56:09 +00:00
Sarah Chin
707c0e96d5
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
Automerger Merge Worker
d628b75774
[automerger skipped] Merge "Add implementation of getInterfaceHash()" am: 95f9335a7d am: 3230683757 am: 6edec02913 -s ours
...
am skip reason: Change-Id I314f19aeca82cc8653eab71c9526ea7a208e6b50 with SHA-1 beee5ed7ef is in history
Change-Id: I5410c6c461d1dc78d2722a3d9f0d6c9b31376b17
2020-01-29 05:47:27 +00:00
Automerger Merge Worker
6edec02913
Merge "Add implementation of getInterfaceHash()" am: 95f9335a7d am: 3230683757
...
Change-Id: I4232678f9f597e132b11556343ea7a6cd3406769
2020-01-29 05:28:30 +00:00
Paul Trautrim
3230683757
Merge "Add implementation of getInterfaceHash()"
...
am: 95f9335a7d
Change-Id: I4d69160572a16e8095e31e641d516f322941da7d
2020-01-28 21:19:13 -08:00
Paul Trautrim
95f9335a7d
Merge "Add implementation of getInterfaceHash()"
2020-01-29 05:12:12 +00:00
Paul Trautrim
69929da705
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
beee5ed7ef
Add implementation of getInterfaceHash()
...
Bug: 136065010
Test: m
Change-Id: I314f19aeca82cc8653eab71c9526ea7a208e6b50
2020-01-28 10:33:11 +09:00
David Su
95956ba7a7
Networking: Rename removeDoubleQuotes to sanitizeSsid
...
Bug: 145745815
Test: compiles
Change-Id: Iaa6f0d65cab556c24b0a9010427de8e6a02836c1
2020-01-27 13:52:26 -08:00
Automerger Merge Worker
5c99a25086
[automerger skipped] Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a am: 08c8da2893 am: a9cdea5664 am: 1cf35d1727 -s ours
...
am skip reason: Change-Id I0ac8c022f70cdf9305c183996c2464a8e04ba5ae with SHA-1 b0097603c6 is in history
Change-Id: Ifd8c1689565b3f0c3dbd4ba083255b5fba22142e
2020-01-27 07:03:25 +00:00
Automerger Merge Worker
1cf35d1727
Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a am: 08c8da2893 am: a9cdea5664
...
Change-Id: I0714a642766e8d6624ff2bc856c6f77c900fa814
2020-01-27 06:56:38 +00:00
Jack Yu
a9cdea5664
Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a
...
am: 08c8da2893
Change-Id: I45158becd88d1e38f492a3ad5023aa96fae5ccd3
2020-01-26 22:50:05 -08:00
Treehugger Robot
08c8da2893
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
7782a0d893
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 b0097603c6 )
2020-01-26 21:37:36 -08:00
Jack Yu
a72b3dc32d
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 ae0809b118 )
2020-01-26 21:34:00 -08:00
Jack Yu
1fe4b30aa9
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 01494a73e2 )
2020-01-26 21:32:12 -08:00
Jack Yu
b0097603c6
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
852f5cf554
[automerger skipped] Merge "Fix javadoc build break s/line/link/" am: 7a1b5c02c1 am: 3360ea4c60 am: b1d6d4bc0e -s ours
...
am skip reason: Change-Id I9df208a9b063b71b2f6cc3099005d1ab38044cd2 with SHA-1 f6fc8abbb0 is in history
Change-Id: I4051342bd696bdc440b3a7ceeeef62ea9b47723d
2020-01-24 19:06:53 +00:00
Automerger Merge Worker
b1d6d4bc0e
Merge "Fix javadoc build break s/line/link/" am: 7a1b5c02c1 am: 3360ea4c60
...
Change-Id: I2debe1dca84bbe175be89686f746bf19f785dda9
2020-01-24 18:57:25 +00:00
Cody Kesting
3360ea4c60
Merge "Fix javadoc build break s/line/link/"
...
am: 7a1b5c02c1
Change-Id: Iba1f8ec62784f68bc415690ccf5966445c9b3542
2020-01-24 10:55:47 -08:00
Automerger Merge Worker
725abe99eb
Merge "Add API for apps to check if they are the network owner" am: 584869a699 am: 4a9782699d am: c0e65d1aaf
...
Change-Id: Ibe4cc2bd1d588dcbccd83f53ee3da9d067ae85b6
2020-01-24 18:47:28 +00:00
Cody Kesting
7a1b5c02c1
Merge "Fix javadoc build break s/line/link/"
2020-01-24 18:37:51 +00:00
Automerger Merge Worker
c0e65d1aaf
Merge "Add API for apps to check if they are the network owner" am: 584869a699 am: 4a9782699d
...
Change-Id: Ifbcc5782a2413ec455896af52a9ac26bc3cda82c
2020-01-24 18:35:13 +00:00
Qingxi Li
4a9782699d
Merge "Add API for apps to check if they are the network owner"
...
am: 584869a699
Change-Id: I1316c7fccd9b7a35ff6d8a79a8afa13644d9ab54
2020-01-24 10:24:12 -08:00
Qingxi Li
584869a699
Merge "Add API for apps to check if they are the network owner"
2020-01-24 18:12:52 +00:00
Nathan Harold
bbb48c6c38
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
bb3347b118
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
515ea576a9
Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 8f1c6d2bfd am: a358c3c92b am: b3d88f7fae
...
Change-Id: Iec4dcf4c39edb8994ed72b9550845ea5962e836a
2020-01-24 17:16:19 +00:00
Automerger Merge Worker
5c8b31eaf7
Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: b9db44d909 am: 47b9f70ebd am: da5eb4d249
...
Change-Id: I5a77211d1f940166c02c4aac31c9add9466c76b1
2020-01-24 17:15:46 +00:00
Automerger Merge Worker
468fae8f2d
[automerger skipped] Merge changes I7065d081,Ic7c3a331,Ia432057b am: 3b219bf784 am: 6043cc09ed am: 6cae47f6e6 -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
0126e1171b
[automerger skipped] Allows the caller to specify configuration by TetheringRequest am: cc1bc1b1a4 am: 1817c9fc4d am: 545d3c6830 -s ours
...
am skip reason: Change-Id Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3 with SHA-1 10ddd02848 is in history
Change-Id: I036e4263a187c92c88c7fc3d33484efd6b687fcb
2020-01-24 17:15:06 +00:00
Automerger Merge Worker
dbfa4c8d0c
[automerger skipped] Make TetheringManager to system API am: eeea0be5b7 am: 6ea097c34e am: 5511101bae -s ours
...
am skip reason: Change-Id Ia432057bf9056727c4a0ca97d160a49274d33581 with SHA-1 75721e4b20 is in history
Change-Id: Ic852b8740f89c0107c770375fbae6f00e96a31c4
2020-01-24 17:15:03 +00:00
Automerger Merge Worker
b3d88f7fae
Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 8f1c6d2bfd am: a358c3c92b
...
Change-Id: Iaa36b7036d916ef7a48314a3dfa224750e720c62
2020-01-24 16:50:29 +00:00
Automerger Merge Worker
da5eb4d249
Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: b9db44d909 am: 47b9f70ebd
...
Change-Id: I771e82db91ed72b5263c1ea73a4b36f85e9f4e61
2020-01-24 16:50:19 +00:00
Automerger Merge Worker
6cae47f6e6
Merge changes I7065d081,Ic7c3a331,Ia432057b am: 3b219bf784 am: 6043cc09ed
...
Change-Id: I801b7f351988322648108a15f7e5d06a47d3a102
2020-01-24 16:49:47 +00:00
Automerger Merge Worker
545d3c6830
Allows the caller to specify configuration by TetheringRequest am: cc1bc1b1a4 am: 1817c9fc4d
...
Change-Id: Icb6d93cc76b7d5511ec0c556c0ed512198bfb781
2020-01-24 16:49:44 +00:00
Automerger Merge Worker
5511101bae
Make TetheringManager to system API am: eeea0be5b7 am: 6ea097c34e
...
Change-Id: Iabb947b90eaaedbce30478e4294823acce085cdb
2020-01-24 16:49:41 +00:00
Automerger Merge Worker
a358c3c92b
Merge "Add AIDL for registering ConnectivityDiagnosticCallbacks." am: 8f1c6d2bfd
...
Change-Id: I5e53fec27728a65e05c7fdf7501dee1052c52e78
2020-01-24 16:39:47 +00:00
Automerger Merge Worker
47b9f70ebd
Merge "Define ConnectivityDiagnosticsCallback IBinder impl." am: b9db44d909
...
Change-Id: I1d60026a7b31af2bc329187685780744c20d7c8c
2020-01-24 16:39:32 +00:00
Automerger Merge Worker
6043cc09ed
Merge changes I7065d081,Ic7c3a331,Ia432057b am: 3b219bf784
...
Change-Id: I1e5d79606f63540f2d9ae3187057e2ba84f4dcb8
2020-01-24 16:38:56 +00:00