Remi NGUYEN VAN
eb8becc1fe
[automerger skipped] Merge "Remove hidden Icon.createWithResource API usage" am: 91c4df62bf am: ebb82b09d9 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722744
Change-Id: I1d642c3eb640d75e16838ff5d85580323404e685
2021-06-04 07:39:09 +00:00
Remi NGUYEN VAN
9c01a8d4b3
[automerger skipped] Merge "Build connectivity JNI against libc++_static" am: 84061f6102 am: 70212c3310 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722743
Change-Id: Ia66209d870a8dc52487269c27a33073e95adbef3
2021-06-04 07:39:04 +00:00
Remi NGUYEN VAN
2cd7e3405b
[automerger skipped] Merge "Remove dependency on libnetd_client" am: 5d3005cc98 am: ab6817ffa2 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722742
Change-Id: I88e6c2cacf33031489becca7c5bd2c22b8c81885
2021-06-04 07:38:24 +00:00
Remi NGUYEN VAN
8a9935160f
Merge "Remove NetdService, NetworkStackClient dependency" am: 062fda1fb3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722746
Change-Id: I5584ab9f1aec16530c9c86cf40423eb773118541
2021-06-04 07:32:38 +00:00
Chiachang Wang
3c946814b6
Merge "Remove ConnectivityService hidden annotations" am: 0a0a3118fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723155
Change-Id: I713d0d0e3a77b11004c05f045a7b6f691a841006
2021-06-04 07:32:21 +00:00
Remi NGUYEN VAN
c02a3e1a2e
Merge "Remove ConnectivityService hidden annotations" am: 448406a3aa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722745
Change-Id: I7c9c507fba8fbe4dce66a8f931f91e4bf25a7a9a
2021-06-04 07:32:06 +00:00
Remi NGUYEN VAN
062fda1fb3
Merge "Remove NetdService, NetworkStackClient dependency"
2021-06-04 07:28:20 +00:00
Remi NGUYEN VAN
ebb82b09d9
Merge "Remove hidden Icon.createWithResource API usage" am: 91c4df62bf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722744
Change-Id: I20aaac797965423bfbd53966f94cd94368ae180e
2021-06-04 07:26:41 +00:00
Remi NGUYEN VAN
70212c3310
Merge "Build connectivity JNI against libc++_static" am: 84061f6102
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722743
Change-Id: I98d0450ca8da40bde399028162a9d30a897903d8
2021-06-04 07:26:26 +00:00
Remi NGUYEN VAN
ab6817ffa2
Merge "Remove dependency on libnetd_client" am: 5d3005cc98
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722742
Change-Id: Ic27863c19e2175d6278e88b547caf9092f01cd4b
2021-06-04 07:23:42 +00:00
Chiachang Wang
0a0a3118fc
Merge "Remove ConnectivityService hidden annotations"
2021-06-04 07:04:29 +00:00
Remi NGUYEN VAN
448406a3aa
Merge "Remove ConnectivityService hidden annotations"
2021-06-04 07:02:37 +00:00
Remi NGUYEN VAN
91c4df62bf
Merge "Remove hidden Icon.createWithResource API usage"
2021-06-04 07:02:15 +00:00
Remi NGUYEN VAN
84061f6102
Merge "Build connectivity JNI against libc++_static"
2021-06-04 07:01:47 +00:00
Remi NGUYEN VAN
5d3005cc98
Merge "Remove dependency on libnetd_client"
2021-06-04 07:01:11 +00:00
Chalard Jean
a88fd95294
[NS04.8] Address comments from NS04 and NS04.5
...
Bug: 167544279
Test: ConnectivityServiceTest
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: Ia930b3d3e723075cb47e267d589c576ee2d4490f
Change-Id: Ia930b3d3e723075cb47e267d589c576ee2d4490f
(cherry-picked from ag/13982288)
2021-06-04 02:37:53 +00:00
Chalard Jean
dd35f2dab0
[NS04.7] Reinstate a necessary change
...
NS04.5 removed a security that it shouldn't have. Reinstate it.
Bug: 167544279
Test: ConnectivityServiceTest
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: If614da813a96d1b50a16fa4be5659e1647d9469d
Change-Id: If614da813a96d1b50a16fa4be5659e1647d9469d
(cherry-picked from ag/13975118)
2021-06-04 02:37:40 +00:00
Chalard Jean
30689b8fd7
[NS04.5] Have NetworkOffer embark a provider ID
...
...instead of a Messenger.
This will be useful later to compare whether a given offer is
offered by the same provider satisfying a request.
Bug: 167544279
Test: ConnectivityServiceTest
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Merged-In: I975a9439021c7fa511c50ac982819b6dd146291e
Change-Id: I975a9439021c7fa511c50ac982819b6dd146291e
(cherry-picked from 148dcce559 )
2021-06-04 02:36:58 +00:00
Remi NGUYEN VAN
22729195ed
[automerger skipped] Merge "Add NDK API for getprocnetwork" am: ae471dd3f2 am: 5a1053d423 -s ours
...
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722734
Change-Id: Iaa13da17466a4d9c521ba6de04eb6f895d21bf7a
2021-06-03 09:41:04 +00:00
Remi NGUYEN VAN
5a1053d423
Merge "Add NDK API for getprocnetwork" am: ae471dd3f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722734
Change-Id: Id05c47d9a6eed0434bdf0c9b9377810036b321c7
2021-06-03 09:36:31 +00:00
vichang
788f0a517a
[automerger skipped] Merge "Use updated NetworkEventDispatcher API" am: 952eed1278 am: 729f247849 -s ours
...
am skip reason: Merged-In Iae3cec4f751e1f74ccd26db6f22f55cf21dfc04a with SHA-1 1f4fa9ffd5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719611
Change-Id: I08f0c128337837b3fa543d61a23c0d70ab674d9d
2021-06-03 09:22:52 +00:00
Chiachang Wang
a3df1ed5f1
Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0 am: b675eba4c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711429
Change-Id: Iede15400f50e5e0f37a95f59b924d8b7dd698509
2021-06-03 09:22:36 +00:00
Treehugger Robot
3ae845be9d
[automerger skipped] Merge "Test tethered callback with TetheringInterface" am: c4d26414f8 am: f5590e79e3 -s ours
...
am skip reason: Merged-In I2a0b8c43fb340c3eaed7f0f90464199222a24280 with SHA-1 82f99f95b7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722733
Change-Id: I28503e9bec154854b69e7c15c2e23a8782e50ac5
2021-06-03 09:19:30 +00:00
vichang
729f247849
Merge "Use updated NetworkEventDispatcher API" am: 952eed1278
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719611
Change-Id: I001a7efddd9e783ce054f740d34c679fe27b0131
2021-06-03 09:17:18 +00:00
Treehugger Robot
66895c05ae
[automerger skipped] Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9 am: ceca234921 -s ours
...
am skip reason: Merged-In I91bcccd676d109c1b974497ac29bd366a41b8899 with SHA-1 9935dbe03e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708093
Change-Id: Icc0d493d7c6ff7e7dcf444309676ca8453c0894a
2021-06-03 09:14:57 +00:00
Aaron Huang
7aa12de842
[automerger skipped] Merge "Add required permission to Tethering" am: 87f051bfa6 am: c84ed50376 -s ours
...
am skip reason: Merged-In I40b45a0f1b44fba0b68e94811d14725a59ed4e59 with SHA-1 a546d85a03 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688267
Change-Id: Ie19938c1988a946b2d1acf66a6bfcb7fa4cab3d6
2021-06-03 09:13:47 +00:00
Chiachang Wang
b675eba4c1
Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711429
Change-Id: Ib1aa32fbf6f2904bd88c418af51db8128ec0bfc2
2021-06-03 09:13:38 +00:00
Remi NGUYEN VAN
4cda76cdb9
Merge "Revert "Add owners block for migration"" am: 43740568b6 am: dc4690f77e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722671
Change-Id: Ib7698688fe1dec6f534a6571c715c4989a93fada
2021-06-03 09:13:30 +00:00
Remi NGUYEN VAN
1f0e609863
[automerger skipped] Skip merge of: Merge fixed history of Connectivity am: 689b08d86d -s ours
...
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809399
Change-Id: Iba158f969b1dcb27804e4be08f836ed3df6694fd
2021-06-03 09:13:22 +00:00
Remi NGUYEN VAN
d1b1cd0961
[automerger skipped] Merge fixed history of Connectivity am: 04a96452cf -s ours
...
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809394
Change-Id: I82710ff2ce1c9176cb9dbacc7df5836199cce9b3
2021-06-03 09:13:11 +00:00
Treehugger Robot
f5590e79e3
Merge "Test tethered callback with TetheringInterface" am: c4d26414f8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722733
Change-Id: If6863c282c259c3fbc6fd3a3f8fc7e4b2510ee23
2021-06-03 09:10:47 +00:00
Treehugger Robot
ceca234921
Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708093
Change-Id: I83a86395d6dd2b2f0a0e8f49e2045508307ac5e7
2021-06-03 09:07:03 +00:00
Aaron Huang
c84ed50376
Merge "Add required permission to Tethering" am: 87f051bfa6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688267
Change-Id: I68b7063f0689407c2259a2387c6bfe6567dc83da
2021-06-03 08:14:34 +00:00
Remi NGUYEN VAN
dc4690f77e
Merge "Revert "Add owners block for migration"" am: 43740568b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722671
Change-Id: I0e59f2b9a9903f12229baeab2a47d49b213ea7f9
2021-06-03 08:13:23 +00:00
Remi NGUYEN VAN
ae471dd3f2
Merge "Add NDK API for getprocnetwork"
2021-06-03 08:07:23 +00:00
lifr
50d8cd23d9
Add CTS test for NetworkRequest.getCapabilities API
...
Bug: 189162033
Test: atest android.net.cts.NetworkRequestTest
atest CtsNetTestCasesLatestSdk:NetworkRequestTest
Change-Id: I8504caa586bdb567d42047a96029dedc67968793
2021-06-03 10:25:57 +08:00
Remi NGUYEN VAN
689b08d86d
Skip merge of: Merge fixed history of Connectivity
...
This merges commit b2f2271ef1 with
"-s ours"
Bug: 186628461
Test: TH
Ignore-AOSP-First: per-branch merges
Merged-In: I9f798dd3a96c917001d52e6167fceb59885ce6f0
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I36d8f58d5cc16d32d3927976394a732945de4767
2021-06-03 11:04:09 +09:00
Remi NGUYEN VAN
04a96452cf
Merge fixed history of Connectivity
...
Bug: 189375701
Bug: 186628461
TEST: TH
Ignore-AOSP-First: per-branch merges
Merged-In: I9f798dd3a96c917001d52e6167fceb59885ce6f0
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I517c9af0f644ee59abebf56b6acce772c19b368d
2021-06-03 10:51:41 +09:00
vichang
952eed1278
Merge "Use updated NetworkEventDispatcher API"
2021-06-02 17:00:58 +00:00
paulhu
71ad4f1175
Implement mobile data preferred uids feature
...
- Read MOBILE_DATA_PREFERRED_UIDS setting when system ready
- Register MOBILE_DATA_PREFERRED_UIDS setting observer
- Send uid ranges to netd when update mobile data preferred uids
Bug: 171872461
Test: atest FrameworksNetTests
Ignore-AOSP-First: Needs cherry-picks
Change-Id: I5153c770650594e05dfa8cf230d7381d790f4a55
2021-06-02 15:40:53 +08:00
Chiachang Wang
02eea987c0
Merge changes I5d3e448e,Id69ac1d3
...
* changes:
Add test for ConnectivityManager.factoryReset
Correct the logic for CtsTetheringUtils.isWifiTetheringSupported
2021-06-02 01:24:10 +00:00
Treehugger Robot
c4d26414f8
Merge "Test tethered callback with TetheringInterface"
2021-06-01 14:35:48 +00:00
Treehugger Robot
414edc4ac9
Merge "Add the tethering type to TetheringEventCallback methods"
2021-06-01 14:33:51 +00:00
paulhu
a1ac564748
Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting
...
Now, PermissionMonitor reigster observer to listen the change
from all users, but "uids allowed on restricted networks" should
affect to all users instead of per each user. Thus, move the
setting from Settings.Secure to Settings.Global.
Bug: 189705071
Test: atest FrameworksNetTests
Ignore-AOSP-First: Need cherry-pick
Change-Id: Ibea354d8dda1f02652a193820f3f9eb573b9a956
2021-06-01 21:28:34 +08:00
Remi NGUYEN VAN
5ba3925037
Remove ConnectivityService hidden annotations
...
BoolRes and VpnType are hidden annotations that should not be used in a
module class.
Test: m
Bug: 171540887
Merged-In: I84690c868ecc62a546ec97bcae2e017a283dc07e
Change-Id: I84690c868ecc62a546ec97bcae2e017a283dc07e
2021-06-01 20:31:54 +08:00
paulhu
5d8340f7ae
Address leftover comments
...
- Add comment to highestPermissionForUid()
- Add testAppsAllowedOnRestrictedNetworksChangedMultipleUsers
- Add synchronized to guard mUidsAllowedOnRestrictedNetworks
access.
Bug: 189705071
Test: atest FrameworksNetTests
Ignore-AOSP-First: Need cherry-pick
Change-Id: I9056758db15e8a21b84ef244d4cacf24c3b79894
2021-06-01 19:04:28 +08:00
Aaron Huang
87f051bfa6
Merge "Add required permission to Tethering"
2021-06-01 10:13:34 +00:00
Remi NGUYEN VAN
326f7bb023
Add min_sdk_version to connectivity targets
...
All targets need min_sdk_version 30 to be included in the tethering
APEX. They will actually never be used on SDK 30 and are only loaded on
31, but this is necessary to be included in com.android.tethering.
Original change (project moved):
I190fd1f3c9fabff057d0a2bd7f45b63a4fe447b3
Bug: 171540887
Test: m
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ied5faa1a370cbc8836f46388fdb9b42d2a263232
2021-06-01 18:43:03 +09:00
Remi NGUYEN VAN
4ee6c5071c
Build service-connectivity with system_server API
...
As all dependencies on hidden API have been removed, build
service-connectivity against system_server_current.
Original change (project moved):
I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4
Bug: 171540887
Test: device boots, has connectivity
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ic628e81ed57ab3b41412e7ef97b8a9bf24dd03df
2021-06-01 18:42:42 +09:00
Remi NGUYEN VAN
829bfbe77c
Add OsCompat
...
Although the InetAddress symbols used by Connectivity are stable core
platform API, and should be usable, the core_current stubs are not yet
part of the module_current API.
Until that is fixed, add an InetAddressCompat utility that calls the
three static methods by reflection.
Original change (project moved):
I8d1a4811a1cc7dbc62f4033c2b320246d1d72b28
Test: atest FrameworksNetTests CtsNetTestCases
Bug: 183097033
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: I70f14edaa2848f78d3b0f1f5b55e0cca4f80ae99
2021-06-01 18:42:19 +09:00