Chalard Jean
cef1fe8e76
Merge "Annotate NSM heavy methods with @WorkerThread" am: e096339dc3 am: 6e3de2d9b6 am: 9c2d78e605
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625859
Change-Id: I6115f4ed727a78f5ed800e7e254913220d1d5bec
2021-03-17 22:10:58 +00:00
Chalard Jean
9c2d78e605
Merge "Annotate NSM heavy methods with @WorkerThread" am: e096339dc3 am: 6e3de2d9b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625859
Change-Id: I4091f82e7b95901a88cd9528c92df4519fb3edd1
2021-03-17 03:08:28 +00:00
Chalard Jean
6e3de2d9b6
Merge "Annotate NSM heavy methods with @WorkerThread" am: e096339dc3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625859
Change-Id: Id925979c238c8ae482dbb9c78bf7f4e0f27255d6
2021-03-17 02:26:48 +00:00
Chalard Jean
e096339dc3
Merge "Annotate NSM heavy methods with @WorkerThread"
2021-03-17 02:03:22 +00:00
Lucas Lin
b326170cac
Merge changes Ib80f814f,Ic605e489 am: 02929bde11 am: 39e98823a3 am: a7baeed6a6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47862eeec4f74a0901b8b866dd6ffa906bd9e62f
2021-03-12 04:58:40 +00:00
Lucas Lin
a7baeed6a6
Merge changes Ib80f814f,Ic605e489 am: 02929bde11 am: 39e98823a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0f41a9cd27dd37c859e69fe02a32b9ab13fb0d46
2021-03-12 04:34:22 +00:00
Lucas Lin
39e98823a3
Merge changes Ib80f814f,Ic605e489 am: 02929bde11
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I94fd187e5f2cc0428807668f82b3a29ad8b66c47
2021-03-12 03:56:18 +00:00
Lucas Lin
02929bde11
Merge changes Ib80f814f,Ic605e489
...
* changes:
Use new API - getIpSecNetIdRange() in IpSecService
Add a new API to get the network ID range of IPSec tunnel interface
2021-03-12 03:30:32 +00:00
Remi NGUYEN VAN
44a25c70dd
[automerger skipped] Add Ethernet, TestNetworkSpecifier API am: 65949518fa am: cd075295ae am: 71bd83fe19 -s ours
...
am skip reason: Change-Id Iee569f5c8bbdc4bc979610e1191308281f3d4620 with SHA-1 a5e4ad7580 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4f60a26f8c19e77d348dfcc7c382022ba6cf0d1
2021-03-12 00:52:15 +00:00
Remi NGUYEN VAN
71bd83fe19
Add Ethernet, TestNetworkSpecifier API am: 65949518fa am: cd075295ae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I63159846579c43c721eeb86c9a55faa3f2888be8
2021-03-12 00:26:45 +00:00
Remi NGUYEN VAN
cd075295ae
Add Ethernet, TestNetworkSpecifier API am: 65949518fa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a1b38fb6b8b6831bac016a8352ae9073758f9af
2021-03-12 00:10:08 +00:00
lucaslin
7eb76590b8
Use new API - getIpSecNetIdRange() in IpSecService
...
Use new API - getIpSecNetIdRange() to get the network ID range
of IPSec tunnel interface.
Bug: 172183305
Test: atest FrameworksNetTests:IpSecServiceTest
Change-Id: Ib80f814f991e9f000a68f5c539d15d97cf56930e
2021-03-11 17:30:18 +00:00
Remi NGUYEN VAN
65949518fa
Add Ethernet, TestNetworkSpecifier API
...
Rename StringNetworkSpecifier to EthernetNetworkSpecifier (its only
production user), and make it module-lib API.
The original StringNetworkSpecifier file is actually kept to satisfy
some invalid dependencies; it will be removed separately.
This allows specifying an Ethernet interface with a non-deprecated API:
until this change the only way to do so would be to use
NetworkRequest#setSpecifier(String), which is deprecated.
Similarly, add the TestNetworkSpecifier API for TestNetworkManager, to
replace previous usage of StringNetworkSpecifier. TestNetworkManager is
module API, so TestNetworkSpecifier should be module API too. This
allows tests to request the test interface specifically, without using
the deprecated NetworkRequest#setSpecifier(String).
Bug: 179329291
Test: m
Merged-In: Iee569f5c8bbdc4bc979610e1191308281f3d4620
Change-Id: Iee569f5c8bbdc4bc979610e1191308281f3d4620
2021-03-11 23:02:02 +08:00
Chalard Jean
63595c6f88
Annotate NSM heavy methods with @WorkerThread
...
Test: TH
Bug: 181906747
Change-Id: Ia30273466c1b91a3dcc5d36dac61f92185dec96e
2021-03-11 10:47:46 +00:00
Remi NGUYEN VAN
18cf575ef3
Merge "Remove unused buildNetworkIdentity" am: f182642b86 am: cd19370eba am: 274f879ec1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622670
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd1c5f5fc46131f6e5b586b76505e7f666547e96
2021-03-10 00:54:43 +00:00
Remi NGUYEN VAN
274f879ec1
Merge "Remove unused buildNetworkIdentity" am: f182642b86 am: cd19370eba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622670
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6517777a7a2922d1d7cee0fabe4dbe2cd286800c
2021-03-10 00:05:51 +00:00
Remi NGUYEN VAN
cd19370eba
Merge "Remove unused buildNetworkIdentity" am: f182642b86
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622670
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9725e5994731a3f5fd8a9044e82e39f02c61f8a
2021-03-09 23:29:15 +00:00
Remi NGUYEN VAN
410e35174d
Merge "Add Ethernet, TestNetworkSpecifier API" into sc-dev
2021-03-09 22:43:46 +00:00
Remi NGUYEN VAN
872fe3f815
Remove unused buildNetworkIdentity
...
The overload using a NetworkState is now unused.
Bug: 174123988
Change-Id: I22f2d2fffd2d70c08097d3217f01393ff8e75ab5
Test: m
2021-03-09 09:31:21 +00:00
Remi NGUYEN VAN
a5e4ad7580
Add Ethernet, TestNetworkSpecifier API
...
Rename StringNetworkSpecifier to EthernetNetworkSpecifier (its only
production user), and make it module-lib API.
The original StringNetworkSpecifier file is actually kept to satisfy
some invalid dependencies; it will be removed separately.
This allows specifying an Ethernet interface with a non-deprecated API:
until this change the only way to do so would be to use
NetworkRequest#setSpecifier(String), which is deprecated.
Similarly, add the TestNetworkSpecifier API for TestNetworkManager, to
replace previous usage of StringNetworkSpecifier. TestNetworkManager is
module API, so TestNetworkSpecifier should be module API too. This
allows tests to request the test interface specifically, without using
the deprecated NetworkRequest#setSpecifier(String).
Bug: 179329291
Test: m
Change-Id: Iee569f5c8bbdc4bc979610e1191308281f3d4620
2021-03-09 07:46:48 +00:00
Chiachang Wang
0923f0fd41
Merge "Replace ConnectivityManager.isNetworkTypeMobile usage in NSS" am: 874aefac33 am: 2155c3400e am: 341f30c018
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612298
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6030cf153aa76f666cafc1b4f28fa17d57a5da3e
2021-03-09 05:56:30 +00:00
Chiachang Wang
341f30c018
Merge "Replace ConnectivityManager.isNetworkTypeMobile usage in NSS" am: 874aefac33 am: 2155c3400e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612298
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I562f3152c1c9f5b360dc7206b888b93d058fe162
2021-03-09 05:10:16 +00:00
Chiachang Wang
2155c3400e
Merge "Replace ConnectivityManager.isNetworkTypeMobile usage in NSS" am: 874aefac33
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612298
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22df755d2226d6e4dec6e25fdcb9ecc249d5e4e6
2021-03-09 04:28:21 +00:00
Chiachang Wang
055165000e
Replace ConnectivityManager.isNetworkTypeMobile usage in NSS
...
ConnectivityManager is a part of connectivity mainline. The
hidden methods dependency in ConnectivityManager should be
removed to make it a moudle. NSS use isNetworkTypeMobile to
check if the NetworkState belongs to a cellular network or not.
It should be replaced by the NetworkCapabilities inside the
NetworkState.
The result of isNetworkTypeMobile relies on the legacy network
type. The legacy network type comes from the network type
of its network info. The replacement should consider VPN active
case because the network type will not be TYPE_MOBILE. Thus,
replace it with Networkcapabilities.getDisplayTransport() to
get a transport that can be used to classify a network when
displaying its info to users, i.e. it will return TRANSPORT_VPN
for a vpn network on cellular network.
Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I2132a7288a93e4430cbd9efabc33ae56ce8bdd9b
2021-03-08 09:11:24 +00:00
Treehugger Robot
c0ab31e654
Merge "[FUI22] Support getAllNetworkStateSnapshot" am: 89f7c5570a am: cc34801bd5 am: 431fec7f2b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52f8339bd1cda35a3f26f28fd3c0165f6f6ff91e
2021-03-05 07:10:46 +00:00
Treehugger Robot
431fec7f2b
Merge "[FUI22] Support getAllNetworkStateSnapshot" am: 89f7c5570a am: cc34801bd5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie34762b31c98bd86f121f17112677cb33704f481
2021-03-05 06:20:16 +00:00
Treehugger Robot
cc34801bd5
Merge "[FUI22] Support getAllNetworkStateSnapshot" am: 89f7c5570a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70cbeb9d2b5b4cb2d09d31444b5d60e887b7e8c2
2021-03-05 05:53:33 +00:00
Yan Yan
96291d9ebe
Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: d032de0ecd am: fc0d3bb1b1 am: 8886f22a59
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619903
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c4a57e4a54410dc5a86bdfed009b42c74c088c7
2021-03-05 05:22:50 +00:00
Yan Yan
8886f22a59
Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: d032de0ecd am: fc0d3bb1b1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619903
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8461d24feead79216b01a1c02b5c5bfdd69284b
2021-03-05 05:18:41 +00:00
Treehugger Robot
89f7c5570a
Merge "[FUI22] Support getAllNetworkStateSnapshot"
2021-03-05 05:16:43 +00:00
Yan Yan
fc0d3bb1b1
Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: d032de0ecd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619903
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I435aebb51bd0bd0ed3eb68460eb864c1e78e1874
2021-03-05 05:11:22 +00:00
Yan Yan
d032de0ecd
Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1""
2021-03-05 02:30:21 +00:00
Yan Yan
88f5da0903
Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"
...
This reverts commit 272ee7c909 .
Reason for revert:
1. The BUILD_VERSIONS.S is 1000, and thus it will prevent
the code from requiring new algorithms on devices whose
first sdk is 31 (e.g. cuttlefish), though these devices
should be treated as first launched with SDK S.
2. It will break #testValidationForAlgosAddedInS, because
the test code is using BUILD_VERSIONS.R to gate the test,
which is inconsistent with the implementation.
Bug: 181887451
Test: atest IpSecAlgorithmTest
Change-Id: I5cd717c5ebd6086ae5cf9abf76311ae4fca0c6e9
2021-03-05 00:15:15 +00:00
junyulai
41c85f50c4
[FUI22] Support getAllNetworkStateSnapshot
...
Currently, ConnectivityService has getAllNetworkState but it is
not ideal to expose as system API since the plan is to get rid
of NetworkState. Thus, create a new one that returns
NetworkStateSnapshot to fulfill the needs.
Note the original getAllNetworkState cannot be deleted now since
it has @UnsupportedAppUsage annotation.
Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: Icddd434552b0e9ecbc8299e7242ec88cf3145aca
2021-03-04 18:41:09 +08:00
Paul Hu
fc189c4f14
Merge "Replace ConnectivityManager hidden symbols on framework" am: 1984fb1cb0 am: 27612f4a2d am: f0ff9b845c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifd0d0d57bc74aaf9590dcdd4aa76919da8ccb7d0
2021-03-04 05:10:48 +00:00
Paul Hu
f0ff9b845c
Merge "Replace ConnectivityManager hidden symbols on framework" am: 1984fb1cb0 am: 27612f4a2d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If400965e3260d8d310faee86e4edce4235130553
2021-03-04 04:23:42 +00:00
Paul Hu
27612f4a2d
Merge "Replace ConnectivityManager hidden symbols on framework" am: 1984fb1cb0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I83a8eb6c8cefd7f84448ad14acd97e6582a4d1e4
2021-03-04 03:11:45 +00:00
Paul Hu
1984fb1cb0
Merge "Replace ConnectivityManager hidden symbols on framework"
2021-03-04 03:07:08 +00:00
Xin Li
645f2ec863
[automerger skipped] Merge "Merge RQ2A.210305.007" am: d60cc74f32 -s ours am: 301610b8c6 -s ours am: 2ae3c09dda -s ours
...
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I988e8a4b397af4360da97e97c79307ba62b155f6
2021-03-04 00:12:15 +00:00
Xin Li
2ae3c09dda
[automerger skipped] Merge "Merge RQ2A.210305.007" am: d60cc74f32 -s ours am: 301610b8c6 -s ours
...
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f023fd4fe72b6254cf51af02ca8bd5967e49549
2021-03-03 23:37:15 +00:00
Xin Li
301610b8c6
[automerger skipped] Merge "Merge RQ2A.210305.007" am: d60cc74f32 -s ours
...
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613627
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05ab53a6a483b8e4dbe40afe6dab40e2b7d328ea
2021-03-03 22:35:44 +00:00
Xin Li
d60cc74f32
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:39 +00:00
Yan Yan
42973053c1
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 90b5d871e1 am: 36e1dd53f2 am: 3124399648
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I057bfdf8528b6f801fd5eb7d0757f19e81efa9a0
2021-03-03 20:22:42 +00:00
Yan Yan
3124399648
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 90b5d871e1 am: 36e1dd53f2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f3416d79ce8936f44edcf87231b902ea875f1d1
2021-03-03 19:05:30 +00:00
Yan Yan
36e1dd53f2
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 90b5d871e1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I565eb522ff02784c36533be2eabb3267c2035991
2021-03-03 18:33:31 +00:00
Treehugger Robot
3b149e9e66
[automerger skipped] Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf am: 11bb09eb21 am: 3e13b2767a -s ours
...
am skip reason: Change-Id I11d4c9ab24de87fb2ad120e3787b78b73133e874 with SHA-1 537b8cfe68 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8be40021b8ea631ed9375e893cfd556378bab2cc
2021-03-03 18:28:29 +00:00
Yan Yan
90b5d871e1
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"
2021-03-03 18:04:52 +00:00
Treehugger Robot
3e13b2767a
Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf am: 11bb09eb21
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1f3a928ed881ddd9826675f4729f35d9d0f1727
2021-03-03 17:22:35 +00:00
Treehugger Robot
11bb09eb21
Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b20786397ff83c0d086549a0d942c5703e31b9a
2021-03-03 16:21:54 +00:00
junyulai
f72320776d
[FUI18] Expose notifyNetworkStatus as system API
...
Test: m -j doc-comment-check-docs
Bug: 174123988
Merged-In: I11d4c9ab24de87fb2ad120e3787b78b73133e874
Change-Id: I11d4c9ab24de87fb2ad120e3787b78b73133e874
(cherry-picked from ag/13749978)
2021-03-03 20:01:46 +08:00