Commit Graph

14299 Commits

Author SHA1 Message Date
paulhu
152cc47c50 [automerger skipped] Add MOBILE_DATA_PREFERRED_APPS setting am: 521169738c am: 26611dc3d3 am: 01c795ec5c -s ours
am skip reason: skip tag Change-Id Ic5e0515b2b948de3d333c8d8e073d0b15514562a with SHA-1 4bbfc2b338 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015

Change-Id: I2c0061b6ee92303bb68f2752d038e578abcb1b85
2021-03-26 05:27:25 +00:00
paulhu
9c02a86837 [automerger skipped] Add PRIVATE_DNS_MODE setting setter am: 87ac58016f am: 43944db404 am: bce84c9a66 -s ours
am skip reason: skip tag Change-Id If234426f041606c4881de1eca31b6f5bdb3c6bfe with SHA-1 2832146318 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014

Change-Id: I75eaedbfd00428cad87e5398c1f3bd54f0dbcd43
2021-03-26 05:27:07 +00:00
paulhu
e77a22a8c3 [automerger skipped] Expose ConnectivitySettingsManager as module-lib API am: e6badefc33 am: df6a143255 am: 578821f72d -s ours
am skip reason: skip tag Change-Id I82225a43f95e3e1d3e52c4e7a0fc541c0087292e with SHA-1 a0714d8a17 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013

Change-Id: Ibbe2daf0a26138fce2db0a00eebd32f1dd7c0df5
2021-03-26 05:26:39 +00:00
Chalard Jean
be07793b86 Merge changes from topic "ns05" into sc-dev
* changes:
  [NS06] Implement the don't-reap mechanism
  [NS05] Feed network offer callbacks
2021-03-26 05:07:39 +00:00
paulhu
01c795ec5c Add MOBILE_DATA_PREFERRED_APPS setting am: 521169738c am: 26611dc3d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015

Change-Id: I25b39c8f35dd80d13775c4a9c5074b2cd8c9f297
2021-03-26 04:36:10 +00:00
paulhu
bce84c9a66 Add PRIVATE_DNS_MODE setting setter am: 87ac58016f am: 43944db404
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014

Change-Id: Iddc394112f17b3e4264a42c6326148833efe9297
2021-03-26 04:36:06 +00:00
paulhu
578821f72d Expose ConnectivitySettingsManager as module-lib API am: e6badefc33 am: df6a143255
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013

Change-Id: I0d623f62c2e5d4c975f74b1efed24bdf5cc7c669
2021-03-26 04:36:02 +00:00
paulhu
26611dc3d3 Add MOBILE_DATA_PREFERRED_APPS setting am: 521169738c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015

Change-Id: I4d5c5cfaa2a35a6919517c6e5737fffdd0f217f3
2021-03-26 04:02:02 +00:00
paulhu
43944db404 Add PRIVATE_DNS_MODE setting setter am: 87ac58016f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014

Change-Id: I97de83147a0c656802601ec116ee9ee7de114884
2021-03-26 03:58:53 +00:00
paulhu
df6a143255 Expose ConnectivitySettingsManager as module-lib API am: e6badefc33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013

Change-Id: I6b53ced3ed523f984dde3c5b24cd53f832284da0
2021-03-26 03:54:38 +00:00
Chiachang Wang
e9ca58e9b5 Merge "Expose BIP and VSIM relavent definitions" into sc-dev 2021-03-26 02:38:34 +00:00
paulhu
521169738c Add MOBILE_DATA_PREFERRED_APPS setting
This setting is OEM upstream requirement for mobile data
preferred apps feature.

Bug: 171872461
Test: atest FrameworksNetTests
Merged-In: Ic5e0515b2b948de3d333c8d8e073d0b15514562a
Change-Id: Iba17bf68cffbe39d1c08ad94364b41bbf851bf57
2021-03-26 02:37:19 +09:00
paulhu
87ac58016f Add PRIVATE_DNS_MODE setting setter
Bug: 182538166
Test: atest FrameworksNetTests
Merged-In: If234426f041606c4881de1eca31b6f5bdb3c6bfe
Change-Id: Iaa9e6cc92f1805ab341c308fc60e947ec4c674f0
2021-03-26 02:37:16 +09:00
paulhu
e6badefc33 Expose ConnectivitySettingsManager as module-lib API
Have getter/setter methods for external modules that can
get/set the setting values.

Bug: 182538166
Test: atest FrameworksNetTests
Merged-In: I82225a43f95e3e1d3e52c4e7a0fc541c0087292e
Change-Id: I61cb00216494e35b6e0dfe444b177cad36ad8afb
2021-03-26 02:35:07 +09:00
Chiachang Wang
b0d4db0353 [automerger skipped] Merge "Add network created callback support" am: c542ed20fa am: cc030c76f5 am: 06b2fd7114 -s ours
am skip reason: skip tag Change-Id I8c2ff7bd6980ae838abc5669f9419d62741b8666 with SHA-1 85d72bdad0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ie637f132849c0d4f20b65b4e6e3e4f7d1bdf141a
2021-03-25 15:11:52 +00:00
Paul Hu
94b3e463e3 Merge "Add MOBILE_DATA_PREFERRED_APPS setting" into sc-dev 2021-03-25 15:01:30 +00:00
Remi NGUYEN VAN
764b73691d Merge "Use connectivity APIs from framework-connectivity" into sc-dev 2021-03-25 14:51:55 +00:00
Chiachang Wang
06b2fd7114 Merge "Add network created callback support" am: c542ed20fa am: cc030c76f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ia98837b70d22f5c15db77c54d58e142967bdd814
2021-03-25 14:22:19 +00:00
Chalard Jean
f278aba302 [NS06] Implement the don't-reap mechanism
This exposes a mechanism for network providers to tell
the network stack that a given network must be kept up
for some specific reason. This is meant to be easier
for them than to have to file a request, in particular
because there is no guaranteed way to make sure the
request will be best matched by any given network.

Test: new test for this
Bug: 167544279
Change-Id: I238a3ee5ee9262477a23b897e4141769dd1505d1
2021-03-25 14:10:06 +00:00
Paul Hu
460ea7fd1a Merge "Add PRIVATE_DNS_MODE setting setter" into sc-dev 2021-03-25 13:59:18 +00:00
Paul Hu
4b60f058d3 Merge "Expose ConnectivitySettingsManager as module-lib API" into sc-dev 2021-03-25 13:50:45 +00:00
Chiachang Wang
cc030c76f5 Merge "Add network created callback support" am: c542ed20fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652209

Change-Id: Ibd2d575b5e3bdfc164c4721bc5bbb0c8b90601e0
2021-03-25 13:42:54 +00:00
Chiachang Wang
c542ed20fa Merge "Add network created callback support" 2021-03-25 13:22:17 +00:00
Chiachang Wang
38e6236781 Expose BIP and VSIM relavent definitions
In order to support special APNs below, OEM may need extra
NetworkCapabilities and apn type definition to support the
carriers request. Add corresponding definition into API
surface.

VSIM: for Virtual SIM service
BIP: for Bearer Independent Protocol

Bug: 130869457
Test: make update-api
Change-Id: I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5
2021-03-25 21:19:37 +08:00
paulhu
4bbfc2b338 Add MOBILE_DATA_PREFERRED_APPS setting
This setting is OEM upstream requirement for mobile data
preferred apps feature.

Bug: 171872461
Test: atest FrameworksNetTests
Change-Id: Ic5e0515b2b948de3d333c8d8e073d0b15514562a
2021-03-25 13:13:15 +00:00
Chalard Jean
7b6a33bd50 [NS05] Feed network offer callbacks
The design is very simply expressed :
An offer is needed for a request if and only if that offer
might beat the satisfier for that request.

The implementation of "might beat" is NetworkRanker#mightBeat.

Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Bug: 167544279
Change-Id: I0fe911eef2483ecbac48c733d56283b81538690a
2021-03-25 22:13:10 +09:00
paulhu
2832146318 Add PRIVATE_DNS_MODE setting setter
Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: If234426f041606c4881de1eca31b6f5bdb3c6bfe
2021-03-25 13:11:54 +00:00
Lucas Lin
72e040d15e [automerger skipped] Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883 am: b4ac20f26b am: 4b44bfce87 -s ours
am skip reason: skip tag Change-Id Ic52864003fbebd9f4e95d43fefc2e168437b0122 with SHA-1 2e4bc41b5b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946

Change-Id: I9f037314105a92d95394f55058bdbdeefd05b9c9
2021-03-25 13:11:34 +00:00
Lucas Lin
f9abdd1958 [automerger skipped] Merge "Remove the usage of NETID_UNSET from Vpn.java" am: 0f114dff28 am: 22f8ded94a am: 82131f1f82 -s ours
am skip reason: skip tag Change-Id I69d449705b1dc541287c72af8dc7705dc4733109 with SHA-1 865b4f2ade is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: I02ac63b20048a4c91a821911c4db0b14805bdef3
2021-03-25 13:10:55 +00:00
Lucas Lin
2864e87624 [automerger skipped] Merge "Expose some APIs from ConnectivityManager" am: bcf2a79ec8 am: cc2827494a am: 59d8bd7380 -s ours
am skip reason: skip tag Change-Id I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c with SHA-1 5140e48a49 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936

Change-Id: Id36817eef371fd456bbb4f95cd713e43b833bae9
2021-03-25 13:10:18 +00:00
Lucas Lin
ccf3768a44 [automerger skipped] Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe am: 6cece1f221 am: fa31b5bfe8 -s ours
am skip reason: skip tag Change-Id Ic2357dcfff3233e0dd17b48b0e376a5095ef60fa with SHA-1 5c3c52975a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: Ib7ed1d9c595b30fadf6efee2ab2614197e156ce1
2021-03-25 13:08:16 +00:00
lucaslin
2e290e01c9 [automerger skipped] Expose NetworkScore to external caller am: 026a987e1e am: e1f3a8b1da am: c76b482ada -s ours
am skip reason: skip tag Change-Id Iddf8c71a5f51a40bc6ff78626b3e8ee530d1b7eb with SHA-1 10d347a2fe is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938

Change-Id: If0f542ea1a8a5dfe422cfc560f68abe7de05fb37
2021-03-25 13:07:51 +00:00
Lucas Lin
4b44bfce87 Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883 am: b4ac20f26b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946

Change-Id: Iaad97aa7b05f7583fc740d0bdaeffd8f23566086
2021-03-25 12:39:43 +00:00
Lucas Lin
82131f1f82 Merge "Remove the usage of NETID_UNSET from Vpn.java" am: 0f114dff28 am: 22f8ded94a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: I5e2dbb8cc31939b1fdc8abc785cb43e9519513af
2021-03-25 12:39:18 +00:00
Lucas Lin
59d8bd7380 Merge "Expose some APIs from ConnectivityManager" am: bcf2a79ec8 am: cc2827494a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936

Change-Id: I9dac472715fc8f32cb6313f2df8aef872bec9632
2021-03-25 12:38:47 +00:00
Lucas Lin
b4ac20f26b Merge "Add annotation for Vpn#getNetwork()" am: 3483ccf883
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653946

Change-Id: I3be5109c253365b3c5bc56ae48114f8e37c4f153
2021-03-25 12:30:18 +00:00
Lucas Lin
22f8ded94a Merge "Remove the usage of NETID_UNSET from Vpn.java" am: 0f114dff28
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653929

Change-Id: Ic50dee391e123b9e9debb8e77bac1f0499d939f1
2021-03-25 12:25:42 +00:00
Chiachang Wang
52078e7fe7 Merge "Add network disconnected callback" into sc-dev 2021-03-25 12:24:20 +00:00
Lucas Lin
fa31b5bfe8 Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe am: 6cece1f221
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: Icf3acbfb071fc2d24f0d31c719446604567e2281
2021-03-25 12:23:01 +00:00
lucaslin
c76b482ada Expose NetworkScore to external caller am: 026a987e1e am: e1f3a8b1da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938

Change-Id: I807cae8d95e8d5fb1f017b1ba11d800772ba3e9c
2021-03-25 12:22:59 +00:00
Lucas Lin
cc2827494a Merge "Expose some APIs from ConnectivityManager" am: bcf2a79ec8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653936

Change-Id: I1a31a6162d5098770c0d5b19faa7af83553f6a2e
2021-03-25 12:17:18 +00:00
paulhu
a0714d8a17 Expose ConnectivitySettingsManager as module-lib API
Have getter/setter methods for external modules that can
get/set the setting values.

Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: I82225a43f95e3e1d3e52c4e7a0fc541c0087292e
2021-03-25 20:12:43 +08:00
Lucas Lin
6cece1f221 Merge changes Ic2357dcf,Iddf8c71a am: 29ed3efbfe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653939

Change-Id: I9c5f96893488f1e103cba740a0bbfb474ffe90b9
2021-03-25 12:07:49 +00:00
lucaslin
e1f3a8b1da Expose NetworkScore to external caller am: 026a987e1e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653938

Change-Id: I5f2fb6bb6f2de4d81fb3b750053ee5abbe82caeb
2021-03-25 11:53:29 +00:00
Lucas Lin
3818accfc1 Merge "Add static for constant" into sc-dev 2021-03-25 11:34:09 +00:00
Lucas Lin
3483ccf883 Merge "Add annotation for Vpn#getNetwork()" 2021-03-25 11:29:38 +00:00
Lucas Lin
0f114dff28 Merge "Remove the usage of NETID_UNSET from Vpn.java" 2021-03-25 11:29:17 +00:00
Lucas Lin
bcf2a79ec8 Merge "Expose some APIs from ConnectivityManager" 2021-03-25 11:29:08 +00:00
Lucas Lin
29ed3efbfe Merge changes Ic2357dcf,Iddf8c71a
* changes:
  Expose NetworkAgent constructor taking a NetworkScore parameter
  Expose NetworkScore to external caller
2021-03-25 11:28:28 +00:00
Chiachang Wang
fb0d390e6f Add network created callback support
Create a network callback to notify network agent after
netd has created the network, so that the NetworkAgent may
wait for this callback and ensure the pre-work to communicate
with netd completed.

Bug: 178725261
Test: make update-api
Change-Id: I8c2ff7bd6980ae838abc5669f9419d62741b8666
Merged-In: I8c2ff7bd6980ae838abc5669f9419d62741b8666
2021-03-25 18:27:24 +08:00