Automerger Merge Worker
dbdf6b65e1
Merge "Make NetworkCapabilities authoritative for suspended state" am: 4a6ab4c857 am: 08dc824058
...
Change-Id: Ic83ca46fc7d0b849bb780c2977387356f8e2a461
2020-01-22 04:23:48 +00:00
Chiachang Wang
08dc824058
Merge "Make NetworkCapabilities authoritative for suspended state"
...
am: 4a6ab4c857
2020-01-21 20:09:36 -08:00
Chiachang Wang
4a6ab4c857
Merge "Make NetworkCapabilities authoritative for suspended state"
2020-01-22 03:29:42 +00:00
Automerger Merge Worker
98e6a7baeb
Merge "Add NetworkRequest#satisfiedBy to SystemApi" am: 579d60d362 am: 6efabf584f
...
Change-Id: I737890e7e164728bae977db806a664c5d93c4fec
2020-01-21 14:34:49 +00:00
Remi NGUYEN VAN
6efabf584f
Merge "Add NetworkRequest#satisfiedBy to SystemApi"
...
am: 579d60d362
2020-01-21 06:21:11 -08:00
Remi NGUYEN VAN
579d60d362
Merge "Add NetworkRequest#satisfiedBy to SystemApi"
2020-01-21 14:12:27 +00:00
Automerger Merge Worker
6ba8ea3e2b
Merge changes I904d87c0,I9ef468a1 am: 85768e2dc3 am: 16a69147ac
...
Change-Id: I253587aca8cb272d0bf9576a84c5c7d5a0bb342a
2020-01-21 12:41:11 +00:00
Chalard Jean
16a69147ac
Merge changes I904d87c0,I9ef468a1
...
am: 85768e2dc3
Change-Id: I4edaf325eb0d18d9871bb3cda8005433e2e40132
2020-01-21 04:29:18 -08:00
Chalard Jean
a00029d752
[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
63cb44db53
[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
Automerger Merge Worker
f0db7e057d
Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST" am: f5b9568ef4 am: df4260c6a5
...
Change-Id: Ib09d67da60524e5360b9587281c6fd5fbe6f7830
2020-01-21 07:18:03 +00:00
Remi NGUYEN VAN
df4260c6a5
Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST"
...
am: f5b9568ef4
2020-01-20 23:05:12 -08:00
Remi NGUYEN VAN
f5b9568ef4
Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST"
2020-01-21 05:52:05 +00:00
Remi NGUYEN VAN
3282a74c5c
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
8156bbe489
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
4a6c12fc4f
Merge "Have registerNetworkAgent return a Network." am: 061d68a40c am: 1a80cea77b
...
Change-Id: I6460295b5c7c045a3d60f5c281295f3a0cf83110
2020-01-21 02:21:35 +00:00
Chiachang Wang
1a80cea77b
Merge "Have registerNetworkAgent return a Network."
...
am: 061d68a40c
Change-Id: I49684d1079d618414149199d2cfe128bd71f7b16
2020-01-20 18:06:33 -08:00
Chalard Jean
fa33a752d9
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
a973c7a8c9
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
Automerger Merge Worker
a39508b74f
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: acd44c89e6
...
Change-Id: I180670ed08710f325b9f83edfe152f10455d856c
2020-01-16 18:34:50 +00:00
Xin Li
acd44c89e6
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
66873f48a0
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: cf09c64473 am: 934f40753c
...
Change-Id: I71d047b955cbb80519bca4cd15d4638dec3dc812
2020-01-15 18:24:31 +00:00
Rambo Wang
934f40753c
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer"
...
am: cf09c64473
2020-01-15 10:08:51 -08:00
Rambo Wang
cf09c64473
Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer"
2020-01-15 17:45:58 +00:00
Automerger Merge Worker
a3e8ee61a1
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: 5df603fce3 am: c7d39858b1
...
Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090
2020-01-15 12:16:25 +00:00
paulhu
c7d39858b1
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"
...
am: 5df603fce3
2020-01-15 04:03:29 -08:00
Treehugger Robot
5df603fce3
Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi"
2020-01-15 11:42:11 +00:00
paulhu
028732ec2c
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
b08d9a6409
Merge "Unhide NetworkRequest API which use legacy type" am: ac9ebd4d14 am: b6551c0c1f
...
Change-Id: I3a72ed77540329a355547c115b0250d00ccf5630
2020-01-15 07:15:12 +00:00
Mark Chien
b6551c0c1f
Merge "Unhide NetworkRequest API which use legacy type"
...
am: ac9ebd4d14
2020-01-14 23:06:28 -08:00
Mark Chien
ac9ebd4d14
Merge "Unhide NetworkRequest API which use legacy type"
2020-01-15 06:49:33 +00:00
Automerger Merge Worker
f2f989d08a
Merge "Expose SocketKeepalive#SUCCESS as SystemApi" am: 7e7cd3b0d4 am: 43d6fdf6f8
...
Change-Id: If67241a41678690a63a9cc20d2125fc2ee90ada6
2020-01-15 05:18:14 +00:00
paulhu
43d6fdf6f8
Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
...
am: 7e7cd3b0d4
2020-01-14 21:08:13 -08:00
Treehugger Robot
7e7cd3b0d4
Merge "Expose SocketKeepalive#SUCCESS as SystemApi"
2020-01-15 05:01:04 +00:00
paulhu
311b769fac
Expose SocketKeepalive#SUCCESS as SystemApi
...
Support wifi mainline module usage.
Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
atest FrameworksNetTests
Change-Id: I94171b2dc4f26442df918547bf8bc40953f63f2e
Merged-In: I94171b2dc4f26442df918547bf8bc40953f63f2e
2020-01-15 02:45:43 +00:00
Rambo Wang
87900774f9
Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer
...
StringNetworkSpecifier is widely used to specify subscription id for
the NetworkRequest. The raw string field introduce ambiguity and leave
large space for bugs. With TelephonyNetworkSpecifer, we are able to
settle down the type and value of the fields (although currently only
one) and introduce validation to detect the bug in the beginning.
Bug: 145993724
Test: atest FrameworksNetTests FrameworksTelephonyTests &
make offline-sdk-docs
Change-Id: Iefbad9b1deb3de2c0b262d9ce5ae0704a50d08a6
2020-01-14 10:51:11 -08:00
Automerger Merge Worker
4f463b6b2f
Merge "Make NattKeepalivePacketData @SystemApi" am: d21ba54347 am: 1f5333e4e7
...
Change-Id: If93d5bacd85fa5209f3fbb55d1cf0af1231e605d
2020-01-14 15:18:43 +00:00
Aaron Huang
1f5333e4e7
Merge "Make NattKeepalivePacketData @SystemApi"
...
am: d21ba54347
2020-01-14 07:03:31 -08:00
Aaron Huang
d21ba54347
Merge "Make NattKeepalivePacketData @SystemApi"
2020-01-14 14:36:09 +00:00
Automerger Merge Worker
cc47efa6f0
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi" am: 0699745a3d am: 837d7c87a9
...
Change-Id: I310847d36d37a4d7a0c3a8675546376a300680f2
2020-01-14 06:17:26 +00:00
Lorenzo Colitti
837d7c87a9
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
...
am: 0699745a3d
2020-01-13 22:04:13 -08:00
Lorenzo Colitti
0699745a3d
Merge "Expose ConnectivityManager#TYPE_NONE as SystemApi"
2020-01-14 05:30:14 +00:00
markchien
ddd5937043
Unhide NetworkRequest API which use legacy type
...
Bug: 144753389
Test: -build, flash, boot
-atest TetheringTests
Change-Id: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
Merged-In: I349da06769e9ffcee6bb42f51ab454e0ef774fb3
2020-01-14 04:56:54 +00:00
Automerger Merge Worker
53aa51e02f
Merge "Support reevaluation request from captive portal app" am: 2d9623d86f am: 8f50df2e87
...
Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2
2020-01-14 02:17:06 +00:00
Chiachang Wang
8f50df2e87
Merge "Support reevaluation request from captive portal app"
...
am: 2d9623d86f
2020-01-13 18:05:03 -08:00
paulhu
62af612113
Expose ConnectivityManager#TYPE_NONE as SystemApi
...
Support wifi mainline module usage.
Bug: 135998869
Test: Build and make system-api-stubs-docs-update-current-api
atest FrameworksNetTests
Change-Id: Ia496aaeaf74fa44764640fd2b97c417509e040aa
2020-01-14 10:02:30 +08:00
Chiachang Wang
2d9623d86f
Merge "Support reevaluation request from captive portal app"
2020-01-14 01:42:22 +00:00
Aaron Huang
5dcbfa87e1
Make NattKeepalivePacketData @SystemApi
...
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
Change-Id: I687f1a8a4b82cb7e4a0dfeb24f0b23a4de6d5287
2020-01-14 01:45:28 +08:00
Automerger Merge Worker
2c8e42ae01
Merge changes from topic "sp04" am: 91c7daa454 am: c91e66f3d1
...
Change-Id: I67f56321014c282cfaf86863a988fd28f9cb124d
2020-01-13 14:28:14 +00:00
Automerger Merge Worker
bde18f1ff1
[SP04] add unit test for NetworkStatsProvider am: d6de56f3fb am: ca0bbc3437
...
Change-Id: I0ce508b3ccf22b01603de7246b2068d3b1a2afcd
2020-01-13 14:28:10 +00:00
