Commit Graph

8650 Commits

Author SHA1 Message Date
Lorenzo Colitti
2cce2e74d7 Don't use a high-priority notification on auto-join.
If the device connects to a network automatically and not through
user action, a high-priority notification is intrusive and is
inconsistent with other networking notifications, which are
usually only high priority if the network is manually selected.

Bug: 130766237
Test: see next CL in patch series
Change-Id: I8824f2d1a0efeb6cb75e430ef5159ebce0018779
2019-06-06 18:21:34 +09:00
Lorenzo Colitti
d048f40fe0 Merge "Always prompt for limited connectivity." am: 98f9af3d1f am: f1397f3dcf am: 7ad2efaeb1
am: 715c67a37d

Change-Id: I47c12ad15135a050f333813ed970623f725a8ec2
2019-06-05 22:21:06 -07:00
Lorenzo Colitti
715c67a37d Merge "Always prompt for limited connectivity." am: 98f9af3d1f am: f1397f3dcf
am: 7ad2efaeb1

Change-Id: I97906e93ad01a0e3a75dd878d06543a8faeee234
2019-06-05 22:04:58 -07:00
Lorenzo Colitti
7ad2efaeb1 Merge "Always prompt for limited connectivity." am: 98f9af3d1f
am: f1397f3dcf

Change-Id: Ie2a78f4aa747cbfb1b2b51f34df04c6ed0dcae27
2019-06-05 21:57:09 -07:00
Lorenzo Colitti
9186840bad [automerger skipped] Merge "Allow passing in acceptUnvalidated without explicitlySelected" am: c8b4342998 am: 1ee4d86be7 -s ours am: b692e9f6e2 -s ours
am: 46708af999 -s ours
am skip reason: change_id I13465090b7b1c0bf5dc83362387a5428d77b7e1d with SHA1 e01696a4c4 is in history

Change-Id: I56d530b59a56534fd9c2d388922a6c9086ca448c
2019-06-05 21:46:49 -07:00
Lorenzo Colitti
98f9af3d1f Merge "Always prompt for limited connectivity." 2019-06-06 04:28:53 +00:00
Lorenzo Colitti
46708af999 [automerger skipped] Merge "Allow passing in acceptUnvalidated without explicitlySelected" am: c8b4342998 am: 1ee4d86be7 -s ours
am: b692e9f6e2 -s ours
am skip reason: change_id I13465090b7b1c0bf5dc83362387a5428d77b7e1d with SHA1 e01696a4c4 is in history

Change-Id: Ifd2dcb0d249425181872108ea53210e407ca3c89
2019-06-05 21:17:45 -07:00
junyulai
68c123c5b1 [automerger skipped] Merge "Fix cannot create Nat-T keepalive on mobile data" am: 4a59f15464 am: 9ede677bb2 -s ours am: 9733f7759d
am: f2f0bce21c

Change-Id: If10640c688b04e9c77330126963b45ec589af22e
2019-06-05 21:16:18 -07:00
junyulai
f2f0bce21c [automerger skipped] Merge "Fix cannot create Nat-T keepalive on mobile data" am: 4a59f15464 am: 9ede677bb2 -s ours
am: 9733f7759d

Change-Id: Ia721500882c2e398c080116bae2aeb7668ee3921
2019-06-05 20:54:58 -07:00
Lorenzo Colitti
b692e9f6e2 [automerger skipped] Merge "Allow passing in acceptUnvalidated without explicitlySelected" am: c8b4342998
am: 1ee4d86be7 -s ours
am skip reason: change_id I13465090b7b1c0bf5dc83362387a5428d77b7e1d with SHA1 e01696a4c4 is in history

Change-Id: If6cfacff38eb2038cc41f4caad83440c8b2f64cb
2019-06-05 20:37:15 -07:00
junyulai
9733f7759d [automerger skipped] Merge "Fix cannot create Nat-T keepalive on mobile data" am: 4a59f15464
am: 9ede677bb2 -s ours
am skip reason: SHA1 9ede677bb2 skipped by user junyulai

Change-Id: I08fd510c9613f075f00a0fffb41ee09a2f02f409
2019-06-05 20:26:48 -07:00
Lorenzo Colitti
2fca94fe48 Always prompt for limited connectivity.
Bug: 130766237
Test: See subsequent CL in same patch series.
Change-Id: I45b4a7ba2e21c0be868939d8c7bb78891d69c48b
2019-06-06 11:59:49 +09:00
Lorenzo Colitti
e6e584d752 Merge "Always prompt for limited connectivity." into qt-dev am: 4a5a129fb2 am: e0b5ac2a74
am: 964e7b539b

Change-Id: I2c8273ee923f1deeed05fecb7413ddb9623edbc3
2019-06-05 13:30:06 -07:00
Lorenzo Colitti
964e7b539b Merge "Always prompt for limited connectivity." into qt-dev am: 4a5a129fb2
am: e0b5ac2a74

Change-Id: I29e8139e908fc68dd656143a19aa2ef142f9108d
2019-06-05 13:13:24 -07:00
Lorenzo Colitti
e0b5ac2a74 Merge "Always prompt for limited connectivity." into qt-dev
am: 4a5a129fb2

Change-Id: I41177562415409ec69b9116caa8f3f2cad03b38e
2019-06-05 12:55:31 -07:00
Lorenzo Colitti
a870366aa2 Always prompt for limited connectivity.
Bug: 130766237
Test: See subsequent CL in same patch series.
Change-Id: I45b4a7ba2e21c0be868939d8c7bb78891d69c48b
2019-06-06 00:32:57 +09:00
Lorenzo Colitti
c8b4342998 Merge "Allow passing in acceptUnvalidated without explicitlySelected" 2019-06-05 05:00:14 +00:00
Lorenzo Colitti
123781f7a5 Merge "Allow passing in acceptUnvalidated without explicitlySelected" 2019-06-05 04:35:45 +00:00
Lorenzo Colitti
476dd3c83a Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: 56b7edcae2 am: b643b2ba9c
am: b484560391

Change-Id: I516f47609c552e8213c218ba9fc0f665fed4b63a
2019-06-04 20:29:05 -07:00
Lorenzo Colitti
b484560391 Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: 56b7edcae2
am: b643b2ba9c

Change-Id: I8e499af0eb8e37f93ba2fa29a0c9510a4e7163db
2019-06-04 19:15:01 -07:00
Lorenzo Colitti
b882c54945 Allow passing in acceptUnvalidated without explicitlySelected
This will allow wifi to tell ConnectivityService that partial
connectivity is acceptable even if the network is not explicitly
selected.

This is needed when the user selects a partial connectivity
network and tells the system to connect to the network, and never
to ask again. In such cases, the system must switch to the
network even if it is not explicitly selected.

Bug: 130766237
Test: atest FrameworksNetTests
Test: unit tests in an upcoming CL
Change-Id: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
Merged-In: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
(cherry picked from commit e01696a4c4)
2019-06-05 11:12:18 +09:00
Lorenzo Colitti
b643b2ba9c Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev
am: 56b7edcae2

Change-Id: Ifd9dbc9c83e426e66417247cbf1fa594193e000f
2019-06-04 18:29:51 -07:00
Lorenzo Colitti
e7b9756d85 Allow passing in acceptUnvalidated without explicitlySelected
This will allow wifi to tell ConnectivityService that partial
connectivity is acceptable even if the network is not explicitly
selected.

This is needed when the user selects a partial connectivity
network and tells the system to connect to the network, and never
to ask again. In such cases, the system must switch to the
network even if it is not explicitly selected.

Bug: 130766237
Test: atest FrameworksNetTests
Test: unit tests in an upcoming CL
Change-Id: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
(cherry picked from commit e01696a4c4)
2019-06-05 01:17:28 +00:00
TreeHugger Robot
56b7edcae2 Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev 2019-06-04 18:00:31 +00:00
junyulai
21a5743bbf Merge "Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb am: ed0f1438e0" into qt-r1-dev-plus-aosp
am: b9322773d2

Change-Id: Ie3def4fb2e5fd98f2f3d77ecbec98bd495aadeeb
2019-06-04 09:11:07 -07:00
junyulai
4c7f60f553 Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb am: 2f233cc104
am: 8bd7b31193

Change-Id: If22a74559b3dd5ad0cd2dc7dd12becf2e0b1e59e
2019-06-04 09:08:35 -07:00
Android Build Merger (Role)
b9322773d2 Merge "Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb am: ed0f1438e0" into qt-r1-dev-plus-aosp 2019-06-04 15:55:18 +00:00
junyulai
b41f0d3860 Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb
am: ed0f1438e0

Change-Id: I9b719ddc913dfaeab2ae13b61dc0ffe96f26b252
2019-06-04 08:54:22 -07:00
junyulai
8bd7b31193 Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb
am: 2f233cc104

Change-Id: I5cc209e05eb91a368c94f76efc961ba5fd2750fb
2019-06-04 08:54:19 -07:00
junyulai
2f233cc104 Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev
am: eabafd5ceb

Change-Id: I580b4dd2e493430e8420ca0907f9cf7d1d5a8773
2019-06-04 08:48:21 -07:00
Lorenzo Colitti
e01696a4c4 Allow passing in acceptUnvalidated without explicitlySelected
This will allow wifi to tell ConnectivityService that partial
connectivity is acceptable even if the network is not explicitly
selected.

This is needed when the user selects a partial connectivity
network and tells the system to connect to the network, and never
to ask again. In such cases, the system must switch to the
network even if it is not explicitly selected.

Bug: 130766237
Test: atest FrameworksNetTests
Test: unit tests in an upcoming CL
Change-Id: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
2019-06-04 14:35:22 +00:00
junyulai
97e3775df4 Fix cannot create Nat-T keepalive on mobile data
Currently phone process fail to unparcel NattKeepalivePacketData
since it is not in framework. Moves NattKeepalivePacketData to
framework to make it can be utilized by telephony.

This change also removes the error feedback triggered by calling
add keepalive packet filter to an unsupported network agent. This
is misinterpreted by KeepaliveTracker that start keepalive is
failing.

Bug: 134048171
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest android.net.cts.ConnectivityManagerTest
      3. atest FrameworksNetTests
      4. atest FrameworksTelephonyTests

Merged-In: If630d5b339aa722717258c721daa8ead8c431e2d
Change-Id: Ic0f168be6f5a6263a5e0565b6381dcb5c645660f
(cherry picked from commit 9ede677bb2c081ccdc41c8c3c19c949114bcc138)
2019-06-04 20:44:29 +08:00
Treehugger Robot
4a59f15464 Merge "Fix cannot create Nat-T keepalive on mobile data" 2019-06-04 12:09:00 +00:00
junyulai
88da121dfe Fix cannot create Nat-T keepalive on mobile data
Currently phone process fail to unparcel NattKeepalivePacketData
since it is not in framework. Moves NattKeepalivePacketData to
framework to make it can be utilized by telephony.

This change also removes the error feedback triggered by calling
add keepalive packet filter to an unsupported network agent. This
is misinterpreted by KeepaliveTracker that start keepalive is
failing.

Bug: 134048171
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest android.net.cts.ConnectivityManagerTest
      3. atest FrameworksNetTests
      4. atest FrameworksTelephonyTests
Change-Id: If630d5b339aa722717258c721daa8ead8c431e2d
2019-06-04 18:22:15 +08:00
Lorenzo Colitti
0e662a5150 Merge "Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev am: 4afb7f9b03 am: 74f7be63fc" into qt-r1-dev-plus-aosp
am: a2abfa2f2b

Change-Id: Ia5d3be740cf1403832833328302eddaab92ed168
2019-06-03 17:25:27 -07:00
Lorenzo Colitti
c48232c18e Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev am: 4afb7f9b03 am: 7c74b37a97
am: d9f0f9fb64

Change-Id: Ia4d9c02424403b143f4a2d1de971d5cd3555baa9
2019-06-03 17:23:17 -07:00
Android Build Merger (Role)
a2abfa2f2b Merge "Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev am: 4afb7f9b03 am: 74f7be63fc" into qt-r1-dev-plus-aosp 2019-06-04 00:18:18 +00:00
Lorenzo Colitti
690c9d6ffc Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev am: 4afb7f9b03
am: 74f7be63fc

Change-Id: Ia33ff8920d47c22b8f901cb5dc9e3e93e3569699
2019-06-03 17:17:25 -07:00
Lorenzo Colitti
d9f0f9fb64 Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev am: 4afb7f9b03
am: 7c74b37a97

Change-Id: Ia8b2e10f2792a22a91c6dfce82cc4cd9790c632c
2019-06-03 17:17:08 -07:00
Lorenzo Colitti
7c74b37a97 Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev
am: 4afb7f9b03

Change-Id: Ic988e284f12b8b54c760d17cd6c6aa93e84f1721
2019-06-03 17:12:14 -07:00
TreeHugger Robot
4afb7f9b03 Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev 2019-06-03 23:58:17 +00:00
Lorenzo Colitti
b0e3c107f5 [automerger skipped] Merge "Re-notify if the network goes to PARTIAL." into qt-dev am: ad3e86a742 -s ours am: 29eefaccfd -s ours
am: 8e5f79ac51 -s ours
am skip reason: change_id I1b79d3faf96ffe792738935088e4ebbdfcc0d878 with SHA1 df84643d9b is in history

Change-Id: I6c8a55b4a3edd8c3ba22bc7315a5ca10f68bb13f
2019-06-03 07:40:48 -07:00
Lorenzo Colitti
8e5f79ac51 [automerger skipped] Merge "Re-notify if the network goes to PARTIAL." into qt-dev am: ad3e86a742 -s ours
am: 29eefaccfd -s ours
am skip reason: change_id I1b79d3faf96ffe792738935088e4ebbdfcc0d878 with SHA1 df84643d9b is in history

Change-Id: I3d7a91b2d281a4df654640f83ca079aeef62ff9d
2019-06-03 07:34:42 -07:00
Lorenzo Colitti
29eefaccfd [automerger skipped] Merge "Re-notify if the network goes to PARTIAL." into qt-dev
am: ad3e86a742 -s ours
am skip reason: change_id I1b79d3faf96ffe792738935088e4ebbdfcc0d878 with SHA1 df84643d9b is in history

Change-Id: Ifa6185f3daa9087e9d2a6ecffb31c6029db331e0
2019-06-03 07:28:46 -07:00
Lorenzo Colitti
e518c3e5ea Merge "Re-notify if the network goes to PARTIAL." am: 94851761a8 am: 58d4e7304c am: df84643d9b
am: 4d034fb062

Change-Id: I30c1d3dcff0ea4272db7af91f7a7588a6edb575f
2019-06-03 06:21:06 -07:00
Lorenzo Colitti
28325f2722 Re-notify if the network goes to PARTIAL.
If NetworkMonitor detects partial connectivity before
EVENT_PROMPT_UNVALIDATED arrives, show the partial
connectivity notification immediately. Re-notify
partial connectivity silently if no internet
notification already there.

Bug: 130683832
Bug: 130766237
Test: atest com.android.server.ConnectivityServiceTest
Change-Id: I7d4eddc643ec795c3961097dc1bdd314d168f6c7
Merged-In: I1b79d3faf96ffe792738935088e4ebbdfcc0d878
(cherry picked from commit 58d4e7304cfce68e338ab34022a0b29d45f42c38)
2019-06-03 13:19:22 +00:00
Lorenzo Colitti
4d034fb062 Merge "Re-notify if the network goes to PARTIAL." am: 94851761a8 am: 58d4e7304c
am: df84643d9b

Change-Id: If3c568a486fdaf5bbbde33676144379670e2aacd
2019-06-03 06:16:03 -07:00
Lorenzo Colitti
df84643d9b Merge "Re-notify if the network goes to PARTIAL." am: 94851761a8
am: 58d4e7304c

Change-Id: I1b79d3faf96ffe792738935088e4ebbdfcc0d878
2019-06-03 06:10:10 -07:00
Lorenzo Colitti
94851761a8 Merge "Re-notify if the network goes to PARTIAL." 2019-06-03 12:50:11 +00:00
Chiachang Wang
61e494012d Re-notify if the network goes to PARTIAL.
If NetworkMonitor detects partial connectivity before
EVENT_PROMPT_UNVALIDATED arrives, show the partial
connectivity notification immediately. Re-notify
partial connectivity silently if no internet
notification already there.

Bug: 130683832
Bug: 130766237
Test: atest com.android.server.ConnectivityServiceTest
Change-Id: I7d4eddc643ec795c3961097dc1bdd314d168f6c7
2019-06-03 12:49:53 +00:00