Commit Graph

7781 Commits

Author SHA1 Message Date
Automerger Merge Worker
346f8902c2 Merge changes from topic "connectivity-diagnostics-system-server" am: fd47d34d34 am: 05bea2cbd5
Change-Id: Iae96f4e55ff74b48275b1559443ba982bb935bbc
2020-01-23 03:28:21 +00:00
Cody Kesting
05bea2cbd5 Merge changes from topic "connectivity-diagnostics-system-server"
am: fd47d34d34

Change-Id: I48a9f1f734b5e2dd4f7ed91c052cec5c8c62c076
2020-01-22 19:10:05 -08:00
Cody Kesting
fd47d34d34 Merge changes from topic "connectivity-diagnostics-system-server"
* changes:
  Add ConnectivityDiagnosticsManager to System Server.
  Make DataStallReport Parcelable.
  Make ConnectivityReport Parcelable.
2020-01-23 01:56:33 +00:00
Automerger Merge Worker
1f1460e410 Merge "Add API for CaptivePortalData" am: 2af00b43b5 am: bfdbb07f60
Change-Id: Ifed2e05d433dda40615af4b41d1f8cf4e9445de0
2020-01-22 16:19:10 +00:00
Remi NGUYEN VAN
bfdbb07f60 Merge "Add API for CaptivePortalData"
am: 2af00b43b5

Change-Id: Iaf58a9dbba5fd5fbe45ec4d795585efe9e3a9e2a
2020-01-22 08:05:11 -08:00
Remi NGUYEN VAN
2af00b43b5 Merge "Add API for CaptivePortalData" 2020-01-22 15:55:17 +00:00
Automerger Merge Worker
b4da9b933d Merge "Add NetworkCapabilities#getSSID to SystemApi" am: 026e45f305 am: ece6c2d06c
Change-Id: I5d98ddd28ac963615b0a00441b8716f32602fbe8
2020-01-22 15:47:20 +00:00
Remi NGUYEN VAN
ece6c2d06c Merge "Add NetworkCapabilities#getSSID to SystemApi"
am: 026e45f305

Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236
2020-01-22 07:30:49 -08:00
Treehugger Robot
026e45f305 Merge "Add NetworkCapabilities#getSSID to SystemApi" 2020-01-22 15:23:07 +00:00
Remi NGUYEN VAN
97ef87510b Add NetworkCapabilities#getSSID to SystemApi
setSSID was added to the API, so it makes sense to have getSSID be part
of the API as well.

Test: m
Bug: 139268426
Change-Id: I6fa9c513ce4fb8ce1e3530776ce8fd5b2e77055e
2020-01-22 22:52:53 +09:00
Remi NGUYEN VAN
a36cf78761 Add API for CaptivePortalData
CaptivePortalData will be used to hold data advertised by the network
following RFC7710bis.

To fetch the CaptivePortalData, the API URL is added to LinkProperties,
to be provided by the NetworkAgent.

Because CaptivePortalData can be used to guess user location (especially
from the URLs provided by the portal), it is only exposed to
applications that have privileged permissions.

Test: atest FrameworksNetTests
Bug: 139269711
Change-Id: I341175b5fece8ee00e19898af5e8eabe66cefbf3
2020-01-22 22:27:44 +09:00
Automerger Merge Worker
0a0eaa7e82 Merge changes from topic "networkagent" am: 024e520f2d am: 4c14caf355
Change-Id: I4815caf8d3fb63f2b585b231b2d926e381b26010
2020-01-22 05:37:25 +00:00
Automerger Merge Worker
e9b063ef86 Rename NetworkMisc to NetworkAgentConfig. am: cf59536753 am: dbacfe4190
Change-Id: I88bad8a6a119e3d137670653b7eeaf3cbc02aed8
2020-01-22 05:37:22 +00:00
Chiachang Wang
4c14caf355 Merge changes from topic "networkagent"
am: 024e520f2d

Change-Id: Iaebb3aaced18257f4beffacc13a0d87efa1a7ec7
2020-01-21 21:32:52 -08:00
Lorenzo Colitti
dbacfe4190 Rename NetworkMisc to NetworkAgentConfig.
am: cf59536753

Change-Id: I1dae34487a5ea484c17895a2d7ae694e8ae1973a
2020-01-21 21:32:30 -08:00
Chiachang Wang
024e520f2d Merge changes from topic "networkagent"
* changes:
  Add a Builder to NetworkAgentConfig, and make it SystemApi.
  Rename NetworkMisc to NetworkAgentConfig.
2020-01-22 05:27:51 +00:00
Automerger Merge Worker
83fc3dc0a2 Merge "Make NetworkAgent stop subclassing Handler." am: 54a2e5c268 am: 69e810b6e6
Change-Id: I87cc2d1dc8485ec628566f46e6283519ec970e10
2020-01-22 04:51:32 +00:00
Chiachang Wang
69e810b6e6 Merge "Make NetworkAgent stop subclassing Handler."
am: 54a2e5c268

Change-Id: Ie308e86e1b1173b0ec7fb7ac4a4f0b6c2bcfafa6
2020-01-21 20:42:19 -08:00
Chiachang Wang
54a2e5c268 Merge "Make NetworkAgent stop subclassing Handler." 2020-01-22 04:33:31 +00:00
Automerger Merge Worker
1caa00ea6b Merge "Make NetworkCapabilities authoritative for roaming state" am: cad1526c91 am: 1a4bc180d8
Change-Id: I1f14e1613d78af8664e7c0f59f5c348455403ec8
2020-01-22 04:24:11 +00:00
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
1a4bc180d8 Merge "Make NetworkCapabilities authoritative for roaming state"
am: cad1526c91

Change-Id: I85043174796af8d37a390786e37993bd224a644a
2020-01-21 20:14:58 -08:00
Chiachang Wang
08dc824058 Merge "Make NetworkCapabilities authoritative for suspended state"
am: 4a6ab4c857

Change-Id: I64db872c2b10972adc3feeb4121dbdf2753226e9
2020-01-21 20:09:36 -08:00
Chiachang Wang
cad1526c91 Merge "Make NetworkCapabilities authoritative for roaming state" 2020-01-22 03:30:09 +00:00
Chiachang Wang
4a6ab4c857 Merge "Make NetworkCapabilities authoritative for suspended state" 2020-01-22 03:29:42 +00:00
Cody Kesting
a5e2cef12e Add ConnectivityDiagnosticsManager to System Server.
ConnectivityDiagnosticsManager should be accessed through
Context#getService. In order for this to be possible, it needs to be
defined as a service inside SystemServiceRegistry.

Bug: 146444622
Test: compiles.
Test: CTS testing in aosp/1211164
Change-Id: I6fe29441ecc9967a04ceb394b3bbe54830bef079
2020-01-21 08:31:56 -08: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

Change-Id: I817020ac31dec9e10ea27fa38f07250f5c447de1
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
Lorenzo Colitti
8e5c76ea67 Add a Builder to NetworkAgentConfig, and make it SystemApi.
Currently, only support the three elements in the config that are
known to be used.

Bug: 138306002
Test: builds, boots
Test: atest FrameworksTelephonyTests
Change-Id: I1d231ec2ddcff97c039bcbc815a39c1d3e26c410
Merged-In: I1d231ec2ddcff97c039bcbc815a39c1d3e26c410
2020-01-21 13:12:15 +00:00
Lorenzo Colitti
cf59536753 Rename NetworkMisc to NetworkAgentConfig.
NetworkMisc is not really an appropriate name for a system API.

Bug: 138306002
Test: builds, boots, wifi works, telephony works
Test: atest FrameworksNetTests FrameworksWifiTests FrameworksTelephonyTests
Change-Id: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
Merged-In: I621cfbe165996c67b201ca2dd2f95a5ab9af10ee
2020-01-21 12:57:27 +00:00
Lorenzo Colitti
c64a5e0ec3 Make NetworkAgent stop subclassing Handler.
Subclassing Handler is not appropriate for a system API because
it is an implementation detail and allows users of this class to
post messages to the handler in ways that allow inappropriate
access to internals that aren't part of the API contract.

Also fix some lint errors.

Test: builds
Bug: 138306002
Change-Id: I79478ceff6bbcae879d1025098d177de0d15dbee
Merged-In: I79478ceff6bbcae879d1025098d177de0d15dbee
2020-01-21 12:55:29 +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

Change-Id: I0207294af01a5cc9594f563398753370e3c7e011
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
Cody Kesting
525fe05ba1 Make DataStallReport Parcelable.
DataStallReport is defined inside ConnectivityDiagnosticsManager. In
order for DataStallReport to be used in aidls, it must implement the
Parcelable interface.

Bug: 143187964
Test: compiles
Test: atest FrameworksNetTests
Change-Id: Idbb4885e2f67fb3f85d406a622ae45d34492dca4
2020-01-20 18:02:09 -08:00
Cody Kesting
8c0043e0f7 Make ConnectivityReport Parcelable.
ConnectivityReport is defined inside ConnectivityDiagnosticsManager. In
order for ConnectivityReport to be used in aidl interfaces, it must
implement the Parcelable interface.

Bug: 143187964
Test: compiles
Test: atest FrameworksNetTests
Change-Id: I8e862c78bd84b5da14203f61ce44beb1ca4a623d
2020-01-20 18:02:09 -08:00
Chalard Jean
c212ed18ec Make NetworkCapabilities authoritative for roaming state
...instead of NetworkInfo

Bug: 138306002
Test: FrameworksNetTests FrameworksTelephonyTests
Change-Id: Ifdea19fa32089b5c7925f5010169b1dea3d2b304
Merged-In: Ifdea19fa32089b5c7925f5010169b1dea3d2b304
2020-01-20 10:45:48 +00: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