Commit Graph

14322 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
f672f1b055 Add option to make sign-in notification ongoing
Add an overlay boolean that allows setting the SIGN_IN notification as
an ongoing notification.

This can be useful to make sure users can always easily find the
notification to sign in to a captive portal, as studies have found that
some users have a tendency to dismiss notifications before reading them.
At the same time the notification shade is generally too crowded, which
is what causes such behaviors in the first place, so this option is not
enabled by default and should generally not be enabled without proper
user studies or metrics.

Bug: 173171709
Test: atest NetworkNotificationManagerTest
Change-Id: Ic187d2a2b7e49ad152ea2aa35bb784864b97473c
2021-04-08 14:42:48 +09:00
Junyu Lai
92a0b5130f Merge "Support Dual ViLTE stats" am: 371bd281f5 am: 4890738bde am: f4cd11179a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: I5739265c2747055b0252da7d1fb9e47d61ca111c
2021-03-29 09:05:02 +00:00
Junyu Lai
f4cd11179a Merge "Support Dual ViLTE stats" am: 371bd281f5 am: 4890738bde
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: Iaa7d8d3dcb106cd19777fe1ff64db5ab4ea75991
2021-03-29 08:26:07 +00:00
Junyu Lai
4890738bde Merge "Support Dual ViLTE stats" am: 371bd281f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920

Change-Id: Ie65e2a2530b3e10b1cb7b571bbe4e7255caf1b08
2021-03-29 07:37:34 +00:00
Remi NGUYEN VAN
26370d89d3 [automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am: a99e50dbf7 am: 7c9169bd61 am: 14c40c0c95 -s ours
am skip reason: skip tag Change-Id If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc with SHA-1 d81932b836 is already in history

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

Change-Id: I29ce6476762b1b4de205481ee8a5cab251220880
2021-03-29 06:59:52 +00:00
Junyu Lai
371bd281f5 Merge "Support Dual ViLTE stats" 2021-03-29 06:59:19 +00:00
Remi NGUYEN VAN
14c40c0c95 Merge "Re-implement NetworkUtils#queryUserAccess." am: a99e50dbf7 am: 7c9169bd61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330

Change-Id: I8c016c0056fd29e60d89d5a90e75a7305ad73231
2021-03-29 06:14:57 +00:00
Remi NGUYEN VAN
7c9169bd61 Merge "Re-implement NetworkUtils#queryUserAccess." am: a99e50dbf7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330

Change-Id: I1dd7913bacf5b92e35ec0a5b14da4d9b40513f21
2021-03-29 05:32:39 +00:00
Remi NGUYEN VAN
a99e50dbf7 Merge "Re-implement NetworkUtils#queryUserAccess." 2021-03-29 04:57:40 +00:00
Lorenzo Colitti
092af05525 Re-implement NetworkUtils#queryUserAccess.
Currently, queryUserAccess talks to netd via FwmarkServer.
Doing this from the module would require exposing queryUserAccess
as an NDK API or reimplementing FwmarkClient.

Because queryUserAccess really only uses information that comes
from ConnectivityService/PermissionMonitor anyway, just use that
information without calling to net.

Test: atest HostsideVpnTests
Bug: 171540887
Merged-In: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc

Change-Id: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc
2021-03-29 12:11:19 +09:00
TreeHugger Robot
b818d4bb73 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-03-26 18:02:54 +00:00
Treehugger Robot
ec623b7fb5 [automerger skipped] Merge "Add network disconnected callback" am: 6d1437a596 am: 11d95a5c72 am: 9e4cb91813 -s ours
am skip reason: skip tag Change-Id I602ff2c688909473b03b72c9407d4286608cff4c with SHA-1 4ab0a63b36 is already in history

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

Change-Id: I7a5a9589eaa8ef0022d5f9ee5f857bbe70fa38ad
2021-03-26 07:54:23 +00:00
Treehugger Robot
9e4cb91813 Merge "Add network disconnected callback" am: 6d1437a596 am: 11d95a5c72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652259

Change-Id: Iec2661c2f77a17784f7be963d1a4d8ec8ef483ec
2021-03-26 07:05:30 +00:00
Treehugger Robot
11d95a5c72 Merge "Add network disconnected callback" am: 6d1437a596
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652259

Change-Id: I75bd112821c42c16d7ed91ecbb4f21104c95204b
2021-03-26 06:28:19 +00:00
Treehugger Robot
6d1437a596 Merge "Add network disconnected callback" 2021-03-26 05:47:33 +00:00
Lorenzo Colitti
080d3830c2 Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: 7de5bd543e am: 994e2cedb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214

Change-Id: I4d69b1ce096d83c311620950650460024ae348c0
2021-03-26 05:27:47 +00:00
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
Lorenzo Colitti
994e2cedb1 Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: 7de5bd543e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214

Change-Id: Ie51249f5fa47b0a5afe287083139082488f9b503
2021-03-26 04:36:19 +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
Bill Yi
8d564a64ef Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icb6afda3dd121777b2868361d2349917d2008d4d
2021-03-26 04:18:32 +00:00
Lorenzo Colitti
7de5bd543e Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214

Change-Id: I02f2f4458329e17ab33d792dee98ffe5f6499ad0
2021-03-26 04:04:27 +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
3ffcb398e2 Add network disconnected callback
Create a network callback to notify network agent after the
native network being destroyed by netd which means the network
is fully disconnected. The NetworkAgent may handle this event
after sending disconnect state to ConnectivityService to proceed
its pending works that have to be done after it.

Bug: 178725261
Test: make update-api
Change-Id: I602ff2c688909473b03b72c9407d4286608cff4c
Merged-In: I602ff2c688909473b03b72c9407d4286608cff4c
2021-03-26 02:53:29 +00:00
Chiachang Wang
e9ca58e9b5 Merge "Expose BIP and VSIM relavent definitions" into sc-dev 2021-03-26 02:38:34 +00:00
Lorenzo Colitti
9150b1ec95 Add unit tests for onBlockedStatusChanged(Network, int).
Bug: 165835257
Test: atest FrameworksNetTests
Change-Id: I0597df71aa94817835d7a2fb54bfcf9222a34b64
2021-03-26 02:37:20 +09: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
Lorenzo Colitti
60104f59a0 Add onBlockedStatusChanged(Network, int) to NetworkCallback.
This is similar to onBlockedStatusChanged(Network, boolean) but
it allows the callback holder to know the exact reason why
networking was blocked. It is useful to privileged system
components such as JobScheduler that are able to ignore some
blocked reasons but not others.

Also add a new BLOCKED_REASON_LOCKDOWN_VPN that is used when
networking is blocked because an always-on VPN is in
lockdown mode.

Also move BLOCKED_METERED_REASON_MASK to ConnectivityManager.
This is necessary because ConnectivityService must ensure that
the blocked status callbacks are correctly sent when meteredness
changes (e.g., a UID that is blocked on metered networks will
become unblocked on a network that becomes unmetered). In order
to do this it needs to know which reasons apply only on metered
networks.

Bug: 165835257
Test: unit tests in subsequent CLs in the stack
Change-Id: I647db4f5a01280be220288e73ffa85c15bec9370
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