Automerger Merge Worker
beba3d20d7
[automerger skipped] Merge "Make NetworkCapabilities authoritative for suspended state" am: 445186aa82 am: a256726fcc am: 2cd8d1fcb3 -s ours
...
am skip reason: Change-Id I4808fcc0047a926b23ed3d49d979bb7b0371dc69 with SHA-1 45d4f10c42
2020-01-22 04:36:19 +00:00
Automerger Merge Worker
2cd8d1fcb3
Merge "Make NetworkCapabilities authoritative for suspended state" am: 445186aa82 am: a256726fcc
...
Change-Id: Ic83ca46fc7d0b849bb780c2977387356f8e2a461
2020-01-22 04:23:48 +00:00
Chiachang Wang
a256726fcc
Merge "Make NetworkCapabilities authoritative for suspended state"
...
am: 445186aa82
2020-01-21 20:09:36 -08:00
Chiachang Wang
445186aa82
Merge "Make NetworkCapabilities authoritative for suspended state"
2020-01-22 03:29:42 +00:00
Automerger Merge Worker
dc259e5e99
[automerger skipped] Merge "Add NetworkRequest#satisfiedBy to SystemApi" am: 2812b46691 am: 27d2bbc474 am: 8a9e6de8ad -s ours
...
am skip reason: Change-Id I1d4a928256951397cabde5c352a872fd48d85859 with SHA-1 04b18a9e7b
2020-01-21 14:51:29 +00:00
Automerger Merge Worker
8a9e6de8ad
Merge "Add NetworkRequest#satisfiedBy to SystemApi" am: 2812b46691 am: 27d2bbc474
...
Change-Id: I737890e7e164728bae977db806a664c5d93c4fec
2020-01-21 14:34:49 +00:00
Remi NGUYEN VAN
27d2bbc474
Merge "Add NetworkRequest#satisfiedBy to SystemApi"
...
am: 2812b46691
2020-01-21 06:21:11 -08:00
Remi NGUYEN VAN
2812b46691
Merge "Add NetworkRequest#satisfiedBy to SystemApi"
2020-01-21 14:12:27 +00:00
Chalard Jean
c3a3b439b7
Merge "New NetworkAgentConfig API to replace NetworkInfo WiFi stuff."
2020-01-21 13:28:35 +00:00
Automerger Merge Worker
a86b6e43a2
Merge changes I904d87c0,I9ef468a1 am: 85768e2dc3 am: f414222461 am: 30b76d89d1
...
Change-Id: Ibbe33fae9f12785abd62b24711e07c4030c949da
2020-01-21 12:50:20 +00:00
Automerger Merge Worker
30b76d89d1
Merge changes I904d87c0,I9ef468a1 am: 85768e2dc3 am: f414222461
...
Change-Id: I253587aca8cb272d0bf9576a84c5c7d5a0bb342a
2020-01-21 12:41:11 +00:00
Chalard Jean
f414222461
Merge changes I904d87c0,I9ef468a1
...
am: 85768e2dc3
Change-Id: I4edaf325eb0d18d9871bb3cda8005433e2e40132
2020-01-21 04:29:18 -08:00
Chalard Jean
62edfd8779
[NS A25] Send all listen callbacks after all rematches
...
Reupload of I2db9535b1d72edd46b968b1bae66b148aa815235 with a
bugfix.
Bug: 113554781
Test: ConnectivityServiceTests NetworkStackTests
Change-Id: I904d87c01d9422ba6233d22a189e8017dd298d37
2020-01-21 19:06:04 +09:00
Chalard Jean
9fc27eab94
[NS A24] Add an object to represent changes in assignment
...
Reupload of I703db6d3f039bd67a90fad0eadffc6cfed9a50ee
Test: ConnectivityServiceTest
Change-Id: I9ef468a17ebcfa684e5614b25dc06fc67eb71c79
2020-01-21 19:05:48 +09:00
Chalard Jean
5f617f9a07
New NetworkAgentConfig API to replace NetworkInfo WiFi stuff.
...
Bug: 139268426
Test: FrameworkWifiTests
Change-Id: Id13fcf41e05fd1eb26c86717e2684c724b94e401
2020-01-21 18:30:31 +09:00
Automerger Merge Worker
bbcc6d3a91
[automerger skipped] Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST" am: 3b74d613e0 am: f45fcda616 am: 26c179cde1 -s ours
...
am skip reason: Change-Id I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f with SHA-1 93de608316
2020-01-21 07:26:30 +00:00
Automerger Merge Worker
26c179cde1
Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST" am: 3b74d613e0 am: f45fcda616
...
Change-Id: Ib09d67da60524e5360b9587281c6fd5fbe6f7830
2020-01-21 07:18:03 +00:00
Remi NGUYEN VAN
f45fcda616
Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST"
...
am: 3b74d613e0
2020-01-20 23:05:12 -08:00
Remi NGUYEN VAN
3b74d613e0
Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST"
2020-01-21 05:52:05 +00:00
Remi NGUYEN VAN
59917caa0e
Add NetworkRequest#satisfiedBy to SystemApi
...
The API is useful for NetworkFactories to select requests based on
capabilities.
This mirrors NetworkCapabilities#satisfiedByNetworkCapabilities
Test: m
Bug: 138306002
Merged-In: I1d4a928256951397cabde5c352a872fd48d85859
Change-Id: I1d4a928256951397cabde5c352a872fd48d85859
(clean cherry-pick from internal branch)
2020-01-21 12:11:52 +09:00
Remi NGUYEN VAN
82b5bb6d4f
Remove handling of EVENT_UNFULFILLABLE_REQUEST
...
This message is not being sent by any component anymore.
Test: built, flashed, WiFi and telephony working
Test: atest FrameworksNetTests
Bug: 138306002
Merged-In: I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f
Change-Id: I5b1ec3136ae8a0a6928e0fb2cda3d5f5e2ca657f
(clean cherry-pick from internal branch)
2020-01-21 12:10:34 +09:00
Automerger Merge Worker
9ae6aaf9d8
[automerger skipped] Merge "Have registerNetworkAgent return a Network." am: 061d68a40c am: 59b776a9e5 am: 5fd790f968 -s ours
...
am skip reason: Change-Id I74710b396fa3cec6fbae08d3dcab5bc90dc2e669 with SHA-1 b0a42f7284
2020-01-21 02:34:32 +00:00
Automerger Merge Worker
5fd790f968
Merge "Have registerNetworkAgent return a Network." am: 061d68a40c am: 59b776a9e5
...
Change-Id: I6460295b5c7c045a3d60f5c281295f3a0cf83110
2020-01-21 02:21:35 +00:00
Chiachang Wang
59b776a9e5
Merge "Have registerNetworkAgent return a Network."
...
am: 061d68a40c
Change-Id: I49684d1079d618414149199d2cfe128bd71f7b16
2020-01-20 18:06:33 -08:00
Chalard Jean
d61375df7c
Make NetworkCapabilities authoritative for suspended state
...
...instead of NetworkInfo
Bug: 138306002
Test: FrameworksNetTests FrameworksTelephonyTests
Change-Id: I4808fcc0047a926b23ed3d49d979bb7b0371dc69
Merged-In: I4808fcc0047a926b23ed3d49d979bb7b0371dc69
2020-01-20 10:37:29 +00:00
Chalard Jean
f78c964538
Have registerNetworkAgent return a Network.
...
This is more useful.
Bug: 135998869
Test: FrameworkNetTests FrameworksWifiTests
Change-Id: I74710b396fa3cec6fbae08d3dcab5bc90dc2e669
Merged-In: I74710b396fa3cec6fbae08d3dcab5bc90dc2e669
2020-01-20 16:22:06 +08:00
Chalard Jean
01b6ba4053
Move NetworkAgent#register to a new method.
...
Calling IPC in a constructor is unusual and confusing, and can be
considered bad form. There are multiple reasons for this :
• Users can't obtain an instance of the class without calling the
constructor, but they can't always afford an IPC where they need
this, forcing them to know about the implementation detail and
sometimes design around it.
• On a related but generalized note, constructors should usually
be fast for the same range of reasons.
• Having a separate method to register the agent simply gives more
flexibility to the app.
• It's also a lot easier to test.
But also we can't fix it without an update to the API, so here it is.
Another reason for doing this is consistency with the NetworkProvider
API.
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I1ee5c7b1353d581e487c8a8a159009bebd781643
2020-01-20 12:54:52 +09:00
Chalard Jean
101719ce8e
Add methods to send connected/disconnected state.
...
Also add methods to set the legacy subtype and the APN name.
These have to be added together because they have to be used
together.
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: Ie90b8d290eab490061d5cb066744b67d597b9469
2020-01-20 12:54:52 +09:00
🌶️Sam Sacco°͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌ne
72106b0b48
Fix invalid use of @note for doc builds.
...
Originally introduced in https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10087632
Change-Id: I35fc4a814238635fa95981649c27230dda319afa
2020-01-18 21:10:40 +00:00
Chalard Jean
fd1758d45e
Add a systemapi constructor for NetworkAgent
...
Bug: 138306002
Bug: 139268426
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
make doc-comment-check-docs
Change-Id: I288ea32fac07a9a486e2ea451a2c9b098446a74c
2020-01-17 14:58:01 +09:00
Chalard Jean
a8cc3cb4c5
Make NetworkCapabilities authoritative for roaming state
...
...instead of NetworkInfo
Bug: 138306002
Test: FrameworksNetTests FrameworksTelephonyTests
Change-Id: Ifdea19fa32089b5c7925f5010169b1dea3d2b304
2020-01-17 14:56:57 +09:00
Chalard Jean
993fb5fbda
Merge "Make NetworkCapabilities authoritative for suspended state"
2020-01-17 05:08:11 +00:00
Automerger Merge Worker
82c769b699
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: c926be1028 am: bb0d2a0466 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8cd5a78633d18b734a7232794ce24f49b0a964df
2020-01-16 19:01:09 +00:00
Automerger Merge Worker
bb0d2a0466
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: c926be1028
...
Change-Id: I180670ed08710f325b9f83edfe152f10455d856c
2020-01-16 18:34:50 +00:00
Chalard Jean
45d4f10c42
Make NetworkCapabilities authoritative for suspended state
...
...instead of NetworkInfo
Bug: 138306002
Test: FrameworksNetTests FrameworksTelephonyTests
Change-Id: I4808fcc0047a926b23ed3d49d979bb7b0371dc69
2020-01-16 15:32:23 +09:00
Xin Li
c926be1028
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
...
Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
2020-01-15 16:15:41 -08:00
Automerger Merge Worker
db2f8836de
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: b2ff467a3a am: b5d058e25d am: 0fee898931
...
Change-Id: I9aee20185e189e51d537b6b0895fdc31c31d0ea2
2020-01-15 18:39:33 +00:00
Automerger Merge Worker
0fee898931
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: b2ff467a3a am: b5d058e25d
...
Change-Id: I71d047b955cbb80519bca4cd15d4638dec3dc812
2020-01-15 18:24:31 +00:00
Rambo Wang
b5d058e25d
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer"
...
am: b2ff467a3a
2020-01-15 10:08:51 -08:00
Rambo Wang
b2ff467a3a
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer"
2020-01-15 17:45:58 +00:00
TreeHugger Robot
cdca11bf4a
Merge "NetworkAgent: Fix doc build fail by invalid tag"
2020-01-15 14:59:04 +00:00
markchien
6079c4d8eb
NetworkAgent: Fix doc build fail by invalid tag
...
Bug: 138306002
Bug: 139268426
Test: make doc-comment-check-docs
Change-Id: I8b8df5096b90ad10545087ab09f68ecae637aa35
2020-01-15 12:58:25 +00:00
Automerger Merge Worker
87172aeccf
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: 7916449753 am: 494d63249a am: c80e25552e
...
Change-Id: Iece2ad4133751a8c258f64d7796158ffe90881ce
2020-01-15 12:33:59 +00:00
Automerger Merge Worker
c80e25552e
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: 7916449753 am: 494d63249a
...
Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090
2020-01-15 12:16:25 +00:00
paulhu
494d63249a
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"
...
am: 7916449753
2020-01-15 04:03:29 -08:00
Treehugger Robot
7916449753
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"
2020-01-15 11:42:11 +00:00
Lorenzo Colitti
9f5958083f
Merge "Make most of NetworkAgent @SystemApi."
2020-01-15 09:56:31 +00:00
paulhu
e102b0bb49
Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi
...
Support wifi mainline module usage.
Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
atest FrameworksNetTests
Change-Id: I77cb45e6b2aaf4ab2c457cb59ccf77b1b8c01fa9
2020-01-15 15:38:23 +08:00
Automerger Merge Worker
0df6dd8e99
[automerger skipped] Merge "Unhide NetworkRequest API which use legacy type" am: a64019915e am: 8dbe02fe3f am: 258cd4b9c3 -s ours
...
am skip reason: Change-Id I349da06769e9ffcee6bb42f51ab454e0ef774fb3 with SHA-1 fd051db78b
2020-01-15 07:29:25 +00:00
Automerger Merge Worker
258cd4b9c3
Merge "Unhide NetworkRequest API which use legacy type" am: a64019915e am: 8dbe02fe3f
...
Change-Id: I3a72ed77540329a355547c115b0250d00ccf5630
2020-01-15 07:15:12 +00:00
