Commit Graph

4866 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
a96f449ce2 Merge "Make TetheringManager to system API" 2020-01-23 00:11:49 +00:00
Amit Mahajan
77129e43f2 Merge changes from topics "npm-add-rm-listener-api", "rename-override-constants"
* changes:
  NetworkPolicyManager: Add @SystemApi for mainlne module
  Use Context.NETWORK_POLICY_SERVICE to get network policy service
  Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi
  Add setSubscriptionOverride() to system API
2020-01-22 18:26:49 +00:00
TreeHugger Robot
351e3b3627 Merge "Update NetworkInfo public API." 2020-01-22 16:38:59 +00:00
Automerger Merge Worker
44d70123be Merge "Add API for CaptivePortalData" am: 144519f45d am: f3011f77d1 am: 36337e9ae1
Change-Id: I951f2eb2a0e2550f65ac87a84b76ea68c2449423
2020-01-22 16:27:53 +00:00
Remi NGUYEN VAN
f3011f77d1 Merge "Add API for CaptivePortalData"
am: 144519f45d

Change-Id: Iaf58a9dbba5fd5fbe45ec4d795585efe9e3a9e2a
2020-01-22 08:05:11 -08:00
Automerger Merge Worker
f6d194648e Merge "Add NetworkCapabilities#getSSID to SystemApi" am: 385afc999e am: 3a8c533d65 am: c6ac75035c
Change-Id: I9bc5d535a809f4873786edbd126ee6ab7a1a293d
2020-01-22 16:01:10 +00:00
Remi NGUYEN VAN
144519f45d Merge "Add API for CaptivePortalData" 2020-01-22 15:55:17 +00:00
markchien
40898cacc2 Make TetheringManager to system API
Also deprecated tethering APIs in ConnectivityManager.
Will have follow up change to remove @hide tethering function in
ConnectivityManager.

Bug: 145093446
Bug: 148038547
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ia432057bf9056727c4a0ca97d160a49274d33581
2020-01-23 00:41:59 +09:00
Remi NGUYEN VAN
3a8c533d65 Merge "Add NetworkCapabilities#getSSID to SystemApi"
am: 385afc999e

Change-Id: I56b30b2719d30660e2efb32a01ab0ce4f7b30236
2020-01-22 07:30:49 -08:00
Treehugger Robot
385afc999e Merge "Add NetworkCapabilities#getSSID to SystemApi" 2020-01-22 15:23:07 +00:00
Aaron Huang
9204f468b0 NetworkPolicyManager: Add @SystemApi for mainlne module
1) Add NetworkPolicyManager.registerSubscriptionCallback and
   NetworkPolicyManager.unregisterSubscriptionCallback for
   registering and unregister.
2) Create SubscriptionCallback to support new @SystemApi
   so that caller could use this object to register and
   unregister.

Bug: 138306002
Test: FrameworksNetTests
      FrameworksTelephonyTests

Change-Id: I56833254a93383e8054c96d296bcb54b777a6e33
2020-01-22 23:35:24 +09:00
Chalard Jean
c4bcf75ff7 Update NetworkInfo public API.
Wifi needs to create these objects so it can include them
in the broadcasts.

Bug: 135998869
Test: FrameworksWifiTests
Change-Id: Ic50d9b5c65e8771708620badc3bc242a8ffbb5cc
2020-01-22 06:07:00 -08:00
Aaron Huang
58d9559369 Add setSubscriptionPlans() and getSubscriptionPlans() @SystemApi
Add two interfaces to communicate with NetworkPolicyManagerService
and make them @SystemApi for mainline support.

Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests

Change-Id: I9f1168bbc70dce9b2b107e1f946737b1d85599c7
2020-01-22 23:03:28 +09:00
Aaron Huang
2d471ca1e1 Add setSubscriptionOverride() to system API
Add new API setSubscriptionOverride() in NetworkPolicyManager
and rename constants OVERRIDE_* to SUBSCRIPTION_OVERRIDE_*.
Make them @SystemApi for mainline support.

Bug: 138306002
Test: atest FrameworksNetTests
      atest FrameworksTelephonyTests

Change-Id: I56c777aa66d6f455695f133f9889979c13cd1bc8
2020-01-22 23:01:47 +09:00
Remi NGUYEN VAN
aa4c511696 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
ead1ef41ee 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
Remi NGUYEN VAN
0e4d731bbc Merge "Delete NetworkFactory from frameworks/base/core." 2020-01-22 08:06:32 +00:00
Chiachang Wang
23d5f84adc Merge changes from topic "networkagent"
am: 0ed49867e2

Change-Id: Iaebb3aaced18257f4beffacc13a0d87efa1a7ec7
2020-01-21 21:32:52 -08:00
Lorenzo Colitti
9e44006fb8 Rename NetworkMisc to NetworkAgentConfig.
am: 2dda9e0627

Change-Id: I1dae34487a5ea484c17895a2d7ae694e8ae1973a
2020-01-21 21:32:30 -08:00
Chiachang Wang
0ed49867e2 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
Chiachang Wang
4fae98e083 Merge "Make NetworkAgent stop subclassing Handler."
am: a11ae54bee

Change-Id: Ie308e86e1b1173b0ec7fb7ac4a4f0b6c2bcfafa6
2020-01-21 20:42:19 -08:00
Chiachang Wang
a11ae54bee Merge "Make NetworkAgent stop subclassing Handler." 2020-01-22 04:33:31 +00:00
Sarah Chin
77a7ea65fd API changes for IPv6 MTU support
Change mtu->mtuV4 and add mtuV6 for DataProfile and DataCallResult
Add mtu to RouteInfo and update test

Test: atest FrameworksTelephonyTests
Bug: 146668814
Change-Id: I43c7e088e46e40f38d8114548e0fc4e39d7f91cb
2020-01-21 20:29:47 -08:00
Remi NGUYEN VAN
938f330d63 Merge "Add NetworkRequest#satisfiedBy to SystemApi"
am: b8f9c4f5b2

Change-Id: I817020ac31dec9e10ea27fa38f07250f5c447de1
2020-01-21 06:21:11 -08:00
Remi NGUYEN VAN
b8f9c4f5b2 Merge "Add NetworkRequest#satisfiedBy to SystemApi" 2020-01-21 14:12:27 +00:00
Lorenzo Colitti
d5ad4726c5 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
2dda9e0627 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
71aee27853 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
Chalard Jean
138271c795 New NetworkAgentConfig API to replace NetworkInfo WiFi stuff.
Bug: 139268426
Test: FrameworkWifiTests
Change-Id: Id13fcf41e05fd1eb26c86717e2684c724b94e401
2020-01-21 18:30:31 +09:00
Remi NGUYEN VAN
1b921169b7 Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST"
am: c5d825c14e

Change-Id: I0207294af01a5cc9594f563398753370e3c7e011
2020-01-20 23:05:12 -08:00
Remi NGUYEN VAN
c5d825c14e Merge "Remove handling of EVENT_UNFULFILLABLE_REQUEST" 2020-01-21 05:52:05 +00:00
Remi NGUYEN VAN
004f90d90f 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
6fab6545d3 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
Chiachang Wang
02cfa7aaf3 Merge "Have registerNetworkAgent return a Network."
am: 061d68a40c

Change-Id: I49684d1079d618414149199d2cfe128bd71f7b16
2020-01-20 18:06:33 -08:00
Chalard Jean
fe35bf9f93 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
29c6e0cc51 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
339ba3ffac 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
TreeHugger Robot
2d667df765 Merge "Fix invalid use of @note for doc builds." 2020-01-20 00:14:36 +00:00
🌶️Sam Sacco°͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌͌ne
fad31b5a0a 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
Automerger Merge Worker
4ba30f5d3c Merge "Revert "Annotate StringNetworkSpecifier @Deprecated and @removed"" am: 1413b254eb am: dd2a5c7c69 am: 6011b4e780
Change-Id: I3cd9356b7ad03b3359f5c00da43092fcb7c40035
2020-01-18 20:54:56 +00:00
Sam Saccone
dd2a5c7c69 Merge "Revert "Annotate StringNetworkSpecifier @Deprecated and @removed""
am: 1413b254eb

Change-Id: I6f7ffbb68e8e87410009ad74e5019d24cab55ca1
2020-01-18 12:29:12 -08:00
Chalard Jean
380f3c9ae6 Merge changes from topics "NetworkAgent_constructor", "roaming"
* changes:
  Add a systemapi constructor for NetworkAgent
  Make NetworkCapabilities authoritative for roaming state
2020-01-18 15:38:15 +00:00
Arsalan Khan
eef98503b8 Revert "Annotate StringNetworkSpecifier @Deprecated and @removed"
This reverts commit e35bc815b6.

Reason for revert: <Build Cop Triage b/147918881>

Change-Id: I6c675a3a245b10d3a0e7f3ebd7d59cf11cff007a
2020-01-18 00:23:51 +00:00
Automerger Merge Worker
4358533bd6 Merge "Annotate StringNetworkSpecifier @Deprecated and @removed" am: bd5a33f03b am: df2c3924ea am: 9f280c19b4
Change-Id: Idc06ad7587362f58f97c5d5d9f639bc30f2e9f26
2020-01-17 22:15:58 +00:00
Rambo Wang
df2c3924ea Merge "Annotate StringNetworkSpecifier @Deprecated and @removed"
am: bd5a33f03b

Change-Id: I1c54215ef9f9ccb4357fb7cec1e22c48ef305bd3
2020-01-17 12:35:11 -08:00
Chalard Jean
3b680ae1e6 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
Rambo Wang
e35bc815b6 Annotate StringNetworkSpecifier @Deprecated and @removed
Bug: 147441267
Test: make offline-sdk-docs
Change-Id: I101021b9e32b55e0845934c04e05f6f06a642617
2020-01-16 21:45:09 -08:00
Aaron Huang
9e0c5262ca Merge "Move DnsSdTxtRecord to net common static library" 2020-01-16 03:15:55 +00:00
Xin Li
e13851556b 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
de38d0529f Merge "Replace StringNetworkSpecifier & subId with TelephonyNetworkSpecifer" am: 7fd95f64df am: 4a76965c68 am: b8a357c250
Change-Id: I9aee20185e189e51d537b6b0895fdc31c31d0ea2
2020-01-15 18:39:33 +00:00