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
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
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
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
Paul Hu
44bfe2d4c0
Merge "Implement mobile data preferred uids feature" into sc-dev am: 87f2897f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14732015
Change-Id: Ic0b248bc137b694aed5fcfc1766093c85ed61711
2021-06-04 09:15:22 +00:00
Paul Hu
7a3102f0f5
Merge "Implement mobile data preferred uids feature" into sc-dev am: 87f2897f90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14732015
Change-Id: I2528dad0ebc73284cf544b1b2e2bd673e5fd69a2
2021-06-04 09:11:35 +00:00
Remi NGUYEN VAN
4dd89c5320
[automerger skipped] Merge "Add OsCompat" am: 1e2ad80467 am: b7d8d93ac9 -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: Ia4e644c979df3da2b08af1d37568f7ecf96a5313
2021-06-04 08:59:16 +00:00
Paul Hu
87f2897f90
Merge "Implement mobile data preferred uids feature" into sc-dev
2021-06-04 08:55:31 +00:00
Remi NGUYEN VAN
b7d8d93ac9
Merge "Add OsCompat" am: 1e2ad80467
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722747
Change-Id: Ic9413d32bedfd6890b7a1bffa286c228af72b32c
2021-06-04 08:37:30 +00:00
Remi NGUYEN VAN
1e2ad80467
Merge "Add OsCompat"
2021-06-04 08:20:30 +00:00
Remi NGUYEN VAN
d9e4d490c3
[automerger skipped] Merge "Remove NetdService, NetworkStackClient dependency" am: 062fda1fb3 am: 8a9935160f -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: Icd377d4aa684fe78f9dfa31d268349159fc67141
2021-06-04 07:39:29 +00:00
Chiachang Wang
d84c904468
Merge "Remove ConnectivityService hidden annotations" am: 0a0a3118fc am: 3c946814b6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723155
Change-Id: I76f466c1a72469291117dfb096c9b9b626eeb9be
2021-06-04 07:39:24 +00:00
Remi NGUYEN VAN
034a7e158e
[automerger skipped] Merge "Remove ConnectivityService hidden annotations" am: 448406a3aa am: c02a3e1a2e -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: I4da2effb957cf238dbc6a3d0f682e1c5ac7be52b
2021-06-04 07:39:15 +00:00
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
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
Aaron Huang
c7c9badcad
Merge "Remove framework-connectivity-annotations library" into sc-dev am: 059ddb4025 am: d80dfe936b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731888
Change-Id: Ibd03ba898c405260abb97404699aef9df0f7c12e
2021-06-04 00:18:10 +00:00