Commit Graph

43103 Commits

Author SHA1 Message Date
Paul Hu
4236e7167c [automerger skipped] Merge "Implement mobile data preferred uids feature" am: 0a0d7c99c9 am: f22f80f3b1 -s ours am: 983b2852c0 -s ours
am skip reason: Merged-In I5153c770650594e05dfa8cf230d7381d790f4a55 with SHA-1 71ad4f1175 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1716396

Change-Id: I4224f84c3c0dc38f69220df54c00623ef465ec4a
2021-06-07 07:38:31 +00:00
Paul Hu
983b2852c0 [automerger skipped] Merge "Implement mobile data preferred uids feature" am: 0a0d7c99c9 am: f22f80f3b1 -s ours
am skip reason: Merged-In I5153c770650594e05dfa8cf230d7381d790f4a55 with SHA-1 71ad4f1175 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1716396

Change-Id: I8d3e4954338eeafd1b3a45fd9bb19000fb5fa01f
2021-06-07 07:22:37 +00:00
Paul Hu
f22f80f3b1 Merge "Implement mobile data preferred uids feature" am: 0a0d7c99c9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1716396

Change-Id: Id9f5ae6380a00596daeea6fe812873a1aac60b03
2021-06-07 07:03:05 +00:00
Paul Hu
0a0d7c99c9 Merge "Implement mobile data preferred uids feature" 2021-06-07 06:46:59 +00:00
Remi NGUYEN VAN
f18a20afd7 [automerger skipped] Merge "Add min_sdk_version to connectivity targets" am: 51c61941ea am: d40c734524 -s ours am: c76928151b -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/+/1722749

Change-Id: I0a3417e39c137fd9a63fcdefb9d717084269b385
2021-06-07 06:17:48 +00:00
Remi NGUYEN VAN
01a1e65b3c [automerger skipped] Merge "Build service-connectivity with system_server API" am: c006592307 am: acff4165a4 -s ours am: df77a6a17b -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/+/1722748

Change-Id: Ic0762976ba0cc8decb4a90a4136d57b110878de9
2021-06-07 06:17:39 +00:00
Remi NGUYEN VAN
c76928151b [automerger skipped] Merge "Add min_sdk_version to connectivity targets" am: 51c61941ea am: d40c734524 -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/+/1722749

Change-Id: I267bda7a156ca2bc26fffefb8e2bcb4cbe4451cb
2021-06-07 05:53:45 +00:00
Remi NGUYEN VAN
df77a6a17b [automerger skipped] Merge "Build service-connectivity with system_server API" am: c006592307 am: acff4165a4 -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/+/1722748

Change-Id: I44e69b32ff44c8698d2213010cdcab854af9a288
2021-06-07 05:53:31 +00:00
Remi NGUYEN VAN
d40c734524 Merge "Add min_sdk_version to connectivity targets" am: 51c61941ea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722749

Change-Id: I19cd6635a87d998fa3f046c6845215e73accb33c
2021-06-07 05:36:24 +00:00
Remi NGUYEN VAN
acff4165a4 Merge "Build service-connectivity with system_server API" am: c006592307
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722748

Change-Id: Ib7b959b42034be815210250a3c36de5343faf3c8
2021-06-07 05:33:22 +00:00
Remi NGUYEN VAN
51c61941ea Merge "Add min_sdk_version to connectivity targets" 2021-06-07 05:18:01 +00:00
Remi NGUYEN VAN
c006592307 Merge "Build service-connectivity with system_server API" 2021-06-07 05:17:21 +00:00
Chiachang Wang
2d8d8f5fe5 [automerger skipped] Add test for ConnectivityManager.factoryReset am: 3d60a42323 am: 1c016b7f07 -s ours
am skip reason: Merged-In I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7 with SHA-1 3d60a42323 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840205

Change-Id: Id2b61896a8d901e36d1d3f1669f5a6a904793fe8
2021-06-07 04:36:09 +00:00
Chiachang Wang
f650efb79e Correct the logic for CtsTetheringUtils.isWifiTetheringSupported am: 0acaa74538 am: 431ca78158
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840204

Change-Id: Id2e8a636f4b25e69c3a460f1ba1b69cbdee0d815
2021-06-07 04:35:54 +00:00
Chiachang Wang
fe0caa6d96 [automerger skipped] Add test for ConnectivityManager.factoryReset am: 3d60a42323 -s ours am: a90a37e57f -s ours
am skip reason: Merged-In I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7 with SHA-1 6391e22faf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840205

Change-Id: I253d22e8d2b9198364430a606343b85a00ac5587
2021-06-07 04:29:15 +00:00
Chiachang Wang
8b44d02d24 Correct the logic for CtsTetheringUtils.isWifiTetheringSupported am: 0acaa74538 am: 5707c1aa5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840204

Change-Id: I128f56c44d4d872cab3bab2bfec0cb5f57004cf0
2021-06-07 04:29:09 +00:00
Chiachang Wang
1c016b7f07 Add test for ConnectivityManager.factoryReset am: 3d60a42323
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840205

Change-Id: Ib7edfb23781ad9ca3a2f8b4d3847f1ed9b58e4fd
2021-06-07 04:15:49 +00:00
Chiachang Wang
431ca78158 Correct the logic for CtsTetheringUtils.isWifiTetheringSupported am: 0acaa74538
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840204

Change-Id: I4ea2374e8b1ce0a7bba540ebef93b222687790e9
2021-06-07 04:15:06 +00:00
Chiachang Wang
a90a37e57f [automerger skipped] Add test for ConnectivityManager.factoryReset am: 3d60a42323 -s ours
am skip reason: Merged-In I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7 with SHA-1 6391e22faf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840205

Change-Id: I8746251d2c03173bc88d9808763776a0f7a39996
2021-06-07 04:12:06 +00:00
Chiachang Wang
5707c1aa5e Correct the logic for CtsTetheringUtils.isWifiTetheringSupported am: 0acaa74538
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840204

Change-Id: Iccd80862d1efa710dff13a0195b7f06e9a3057f0
2021-06-07 04:11:57 +00:00
paulhu
51f77dcc49 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
Merged-In: I5153c770650594e05dfa8cf230d7381d790f4a55
(cherry-pick with minor conflicts)

Change-Id: I5153c770650594e05dfa8cf230d7381d790f4a55
2021-06-07 02:55:25 +00:00
Junyu Lai
c6aa16143e [automerger skipped] Merge changes Ia930b3d3,If614da81,I975a9439 am: 9756b5d4f9 am: dd917b7f4c -s ours am: 7254130c57 -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/+/1722738

Change-Id: I95e8f3b39eda991935a3f8f40388a038f6b3f033
2021-06-04 21:50:23 +00:00
Chalard Jean
39fecf2dd2 [automerger skipped] [NS04.7] Reinstate a necessary change am: dd35f2dab0 am: f2515d397c -s ours am: f11a106896 -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/+/1722737

Change-Id: I0a2f1de2d2a1297491701c6c4498566fc2fba191
2021-06-04 21:50:21 +00:00
Chalard Jean
a74ea0d8c4 [automerger skipped] [NS04.5] Have NetworkOffer embark a provider ID am: 30689b8fd7 am: c79f3f3a38 -s ours am: 42e40e2482 -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/+/1722736

Change-Id: I426331b151bee642cbd8004f1c0f2aee3e23a596
2021-06-04 21:50:18 +00:00
Junyu Lai
7254130c57 [automerger skipped] Merge changes Ia930b3d3,If614da81,I975a9439 am: 9756b5d4f9 am: dd917b7f4c -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/+/1722738

Change-Id: I9748cbf5bcafbbbb07949ea6aee30171c8065a50
2021-06-04 21:26:16 +00:00
Chalard Jean
f11a106896 [automerger skipped] [NS04.7] Reinstate a necessary change am: dd35f2dab0 am: f2515d397c -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/+/1722737

Change-Id: Ie8a53fc992c3218df4b927706d459fbaba8637ba
2021-06-04 21:26:15 +00:00
Chalard Jean
42e40e2482 [automerger skipped] [NS04.5] Have NetworkOffer embark a provider ID am: 30689b8fd7 am: c79f3f3a38 -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/+/1722736

Change-Id: I1425f823b74c34d72528144af9f17d60fc6f1408
2021-06-04 21:26:12 +00:00
Junyu Lai
dd917b7f4c Merge changes Ia930b3d3,If614da81,I975a9439 am: 9756b5d4f9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722738

Change-Id: Ie28b41508c9d9f8cc89dca5a621d4cc309ba8654
2021-06-04 21:13:35 +00:00
Chalard Jean
f2515d397c [NS04.7] Reinstate a necessary change am: dd35f2dab0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722737

Change-Id: Ia047b5757328329ceb602ce5dda7ea21e67e9255
2021-06-04 21:13:32 +00:00
Chalard Jean
c79f3f3a38 [NS04.5] Have NetworkOffer embark a provider ID am: 30689b8fd7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722736

Change-Id: Iba7591f32e9a90ced10d6c9f200e84fc28f9246a
2021-06-04 21:13:26 +00:00
Junyu Lai
9756b5d4f9 Merge changes Ia930b3d3,If614da81,I975a9439
* changes:
  [NS04.8] Address comments from NS04 and NS04.5
  [NS04.7] Reinstate a necessary change
  [NS04.5] Have NetworkOffer embark a provider ID
2021-06-04 20:52:38 +00:00
Chiachang Wang
3d60a42323 Add test for ConnectivityManager.factoryReset
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk on R and S device
Merged-In: I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7
Change-Id: I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7
2021-06-04 13:29:54 +00:00
Chiachang Wang
0acaa74538 Correct the logic for CtsTetheringUtils.isWifiTetheringSupported
The existing isWifiTetheringSupported only check if tethering side
supports wifi tethering or not but not wifi side. A expected
behavior should include both of them, so add the wifi side check
into the helper function. Also update in the existing caller side
due to a new parameter added.

Bug: 186061922
Test: atest MtsTetheringTestLatestSdk
Megred-In: Id69ac1d30ab2bbf23e870193335b139f54672636
Change-Id: Id69ac1d30ab2bbf23e870193335b139f54672636
Ignore-AOSP-First: cherry-pick
2021-06-04 13:29:38 +00:00
Paul Hu
67f69981bb [automerger skipped] Merge "Update allowed on restricted networks getter/setter" am: c30c57c210 am: e6b5402b09 -s ours am: 9905a69f7e -s ours
am skip reason: Merged-In I979bf98075e6c9c0ed7e891582843fddb62643cb with SHA-1 68aacb407a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719399

Change-Id: I97149db6fe50109f8969cba39e88165a90681e16
2021-06-04 11:31:44 +00:00
Paul Hu
9905a69f7e [automerger skipped] Merge "Update allowed on restricted networks getter/setter" am: c30c57c210 am: e6b5402b09 -s ours
am skip reason: Merged-In I979bf98075e6c9c0ed7e891582843fddb62643cb with SHA-1 68aacb407a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719399

Change-Id: I46854ce18a927afd2f8a5a69d3359915125e6761
2021-06-04 11:14:25 +00:00
Frank Li
17115632dc Merge "Add CTS test for NetworkRequest.getCapabilities API" am: ae5bd10a09 am: c49ad80e83 am: a08a673bc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717737

Change-Id: I17cb4ee42f17413c97631a8c568d0c22e72b79bf
2021-06-04 10:59:36 +00:00
Paul Hu
b7ce99b69a Merge "Implement mobile data preferred uids feature" into sc-dev am: 87f2897f90 am: 7a3102f0f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14732015

Change-Id: I55da9d7bff8ea5db5f4c5194603238c351ffde11
2021-06-04 10:59:30 +00:00
Remi NGUYEN VAN
4113d92082 [automerger skipped] Merge "Add OsCompat" am: 1e2ad80467 am: b7d8d93ac9 -s ours am: 4dd89c5320 -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/+/1722747

Change-Id: I8a4137488f83577d4ce6720a8be71d8e2da84d91
2021-06-04 10:59:20 +00:00
Remi NGUYEN VAN
5d19292811 [automerger skipped] Merge "Remove NetdService, NetworkStackClient dependency" am: 062fda1fb3 am: 8a9935160f -s ours am: d9e4d490c3 -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/+/1722746

Change-Id: I0a3d45f2cbe793049c3ee0a38d56c179a9207650
2021-06-04 10:58:57 +00:00
Chiachang Wang
28d746c46f Merge "Remove ConnectivityService hidden annotations" am: 0a0a3118fc am: 3c946814b6 am: d84c904468
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723155

Change-Id: I5b6b781e1661942483c811e60dea197e7f2da9d2
2021-06-04 10:58:30 +00:00
Remi NGUYEN VAN
5fdd2350a8 [automerger skipped] Merge "Remove ConnectivityService hidden annotations" am: 448406a3aa am: c02a3e1a2e -s ours am: 034a7e158e -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/+/1722745

Change-Id: Ib0b9a085d6c5c8e9b8b02f80e6d814d882f4fb4d
2021-06-04 10:58:00 +00:00
Remi NGUYEN VAN
71720edbef [automerger skipped] Merge "Remove hidden Icon.createWithResource API usage" am: 91c4df62bf am: ebb82b09d9 -s ours am: eb8becc1fe -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: I152e73f2f93c1d92cac4f54222135edf2fe396bb
2021-06-04 10:57:19 +00:00
Remi NGUYEN VAN
a0d502cbf2 [automerger skipped] Merge "Build connectivity JNI against libc++_static" am: 84061f6102 am: 70212c3310 -s ours am: 9c01a8d4b3 -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: I9e81bc2c1c25d1208813a1d17327293e759ca3ae
2021-06-04 10:56:39 +00:00
Remi NGUYEN VAN
ca7d992a14 [automerger skipped] Merge "Remove dependency on libnetd_client" am: 5d3005cc98 am: ab6817ffa2 -s ours am: 2cd7e3405b -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: I933e9aa94069fce7a30dbfc6bafe74922bec23d4
2021-06-04 10:53:20 +00:00
Paul Hu
e6b5402b09 Merge "Update allowed on restricted networks getter/setter" am: c30c57c210
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719399

Change-Id: I68bf2e5f3b282e98376f24bc11108fd7323c1e06
2021-06-04 10:50:40 +00:00
Paul Hu
c30c57c210 Merge "Update allowed on restricted networks getter/setter" 2021-06-04 10:31:50 +00:00
Frank Li
a08a673bc5 Merge "Add CTS test for NetworkRequest.getCapabilities API" am: ae5bd10a09 am: c49ad80e83
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717737

Change-Id: I455ef5114e96969bb09bd5bbb0034ac4ebbc6f82
2021-06-04 10:04:43 +00:00
Frank Li
c49ad80e83 Merge "Add CTS test for NetworkRequest.getCapabilities API" am: ae5bd10a09
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1717737

Change-Id: Id6b9f05c83fe84acae4b72fa54aeb1957853a534
2021-06-04 09:50:32 +00:00
Paul Hu
fa607cbc3d Merge "Implement mobile data preferred uids feature" into sc-dev am: 87f2897f90 am: 44bfe2d4c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14732015

Change-Id: Ia41a71b3bd22fbee4b842c8fb49ce64956c93d2c
2021-06-04 09:36:03 +00:00
Frank Li
ae5bd10a09 Merge "Add CTS test for NetworkRequest.getCapabilities API" 2021-06-04 09:29:04 +00:00