Commit Graph

7264 Commits

Author SHA1 Message Date
Benedict Wong
cbbbb1fb9d Revert "Add one more test for VPN usage stats." am: e81acb7351 am: c57fff650e
am: 7aee019ab7

Change-Id: I0f46aeeb024e7ca6e694ba8cdf0893b12dc12c0b
2019-06-07 02:48:23 -07:00
Benedict Wong
7aee019ab7 Revert "Add one more test for VPN usage stats." am: e81acb7351
am: c57fff650e

Change-Id: I9061566f5d747e984fcbc8b3e0e428b75d02820b
2019-06-07 02:43:21 -07:00
Benedict Wong
c57fff650e Revert "Add one more test for VPN usage stats."
am: e81acb7351

Change-Id: I72ae3f9575fe954f4f1db4b85b0f19d15448fbbf
2019-06-07 02:33:21 -07:00
Benedict Wong
e81acb7351 Revert "Add one more test for VPN usage stats."
This reverts commit 54bb4f4608.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I64b48d575f2e6ec4cb7d2d100a859a30af0501dc
2019-06-07 09:16:48 +00:00
Lorenzo Colitti
f188699e2f Merge "Don't use a high-priority notification on auto-join." am: 4658a44342 am: 3c695c1501 am: 89982edb36
am: 36d74586e9

Change-Id: I6832e7c3c50a648a5583e36966753f7c4521431a
2019-06-07 01:53:44 -07:00
Lorenzo Colitti
36d74586e9 Merge "Don't use a high-priority notification on auto-join." am: 4658a44342 am: 3c695c1501
am: 89982edb36

Change-Id: I4d1d47a536e93403b5817acecbcdc54045e6cc38
2019-06-07 01:49:39 -07:00
Lorenzo Colitti
89982edb36 Merge "Don't use a high-priority notification on auto-join." am: 4658a44342
am: 3c695c1501

Change-Id: I2da85c5824c9a13c7f17a5872438dbd6490e7d58
2019-06-07 01:44:55 -07:00
Lorenzo Colitti
4658a44342 Merge "Don't use a high-priority notification on auto-join." 2019-06-07 08:26:38 +00:00
Lorenzo Colitti
faee26026f 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-07 12:53:30 +09:00
Lorenzo Colitti
1ba72acdfb Merge "Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c am: 59bd1330a3" into qt-r1-dev-plus-aosp
am: bdd4c14e86

Change-Id: I9fda29c3da0a1ecdc7c5b616e1d0d364b797da71
2019-06-06 04:26:14 -07:00
Lorenzo Colitti
5e82f100ba Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c am: 71feb6467f
am: 7b19ed0a69

Change-Id: I605c0570c51f718e0883f540999670768e0a2a4d
2019-06-06 04:24:44 -07:00
Android Build Merger (Role)
bdd4c14e86 Merge "Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c am: 59bd1330a3" into qt-r1-dev-plus-aosp 2019-06-06 11:20:49 +00:00
Lorenzo Colitti
7b19ed0a69 Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c
am: 71feb6467f

Change-Id: I9798141003ab3489af55892d76533f3edac575f7
2019-06-06 04:19:44 -07:00
Lorenzo Colitti
b8c73cd9ce Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c
am: 59bd1330a3

Change-Id: Ia96c03d26ecbe0eb8f7d680b5f876d707127e03b
2019-06-06 04:19:43 -07:00
Lorenzo Colitti
59bd1330a3 Merge "Don't use a high-priority notification on auto-join." into qt-dev
am: 831831c76c

Change-Id: Ie18c89162fd9db72a9f77db3737cb9054a5316b7
2019-06-06 04:15:44 -07:00
Lorenzo Colitti
31b6b56633 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
1e571de92d Merge "Always prompt for limited connectivity." am: 19dd9a3f83 am: f1397f3dcf am: a4b5db480f
am: d1f9c90b04

Change-Id: I47c12ad15135a050f333813ed970623f725a8ec2
2019-06-05 22:21:06 -07:00
Lorenzo Colitti
d1f9c90b04 Merge "Always prompt for limited connectivity." am: 19dd9a3f83 am: f1397f3dcf
am: a4b5db480f

Change-Id: I97906e93ad01a0e3a75dd878d06543a8faeee234
2019-06-05 22:04:58 -07:00
Lorenzo Colitti
a4b5db480f Merge "Always prompt for limited connectivity." am: 19dd9a3f83
am: f1397f3dcf

Change-Id: Ie2a78f4aa747cbfb1b2b51f34df04c6ed0dcae27
2019-06-05 21:57:09 -07:00
Lorenzo Colitti
a8a09bf34d [automerger skipped] Merge "Allow passing in acceptUnvalidated without explicitlySelected" am: 219512edd0 am: 1ee4d86be7 -s ours am: d711f798a8 -s ours
am: 5fd0691a95 -s ours
am skip reason: change_id I13465090b7b1c0bf5dc83362387a5428d77b7e1d with SHA1 9a79a6d41e is in history

Change-Id: I56d530b59a56534fd9c2d388922a6c9086ca448c
2019-06-05 21:46:49 -07:00
Lorenzo Colitti
19dd9a3f83 Merge "Always prompt for limited connectivity." 2019-06-06 04:28:53 +00:00
Lorenzo Colitti
5fd0691a95 [automerger skipped] Merge "Allow passing in acceptUnvalidated without explicitlySelected" am: 219512edd0 am: 1ee4d86be7 -s ours
am: d711f798a8 -s ours
am skip reason: change_id I13465090b7b1c0bf5dc83362387a5428d77b7e1d with SHA1 9a79a6d41e is in history

Change-Id: Ifd2dcb0d249425181872108ea53210e407ca3c89
2019-06-05 21:17:45 -07:00
junyulai
7f23c35603 [automerger skipped] Merge "Fix cannot create Nat-T keepalive on mobile data" am: fa5768a4a3 am: 9ede677bb2 -s ours am: ccdb653d59
am: 9bd941e89e

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

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

Change-Id: If6cfacff38eb2038cc41f4caad83440c8b2f64cb
2019-06-05 20:37:15 -07:00
junyulai
ccdb653d59 [automerger skipped] Merge "Fix cannot create Nat-T keepalive on mobile data" am: fa5768a4a3
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
559503f05e 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
a1190662af Merge "Always prompt for limited connectivity." into qt-dev am: 4a5a129fb2 am: 17c15a4210
am: 6e3d1ec0c8

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

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

Change-Id: I41177562415409ec69b9116caa8f3f2cad03b38e
2019-06-05 12:55:31 -07:00
Lorenzo Colitti
619744ab5a 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
219512edd0 Merge "Allow passing in acceptUnvalidated without explicitlySelected" 2019-06-05 05:00:14 +00:00
Lorenzo Colitti
b1e4558e39 Merge "Allow passing in acceptUnvalidated without explicitlySelected" 2019-06-05 04:35:45 +00:00
Lorenzo Colitti
50300b6476 Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: f09098bacb am: 27c3d9c177
am: ccf1e30fbf

Change-Id: I516f47609c552e8213c218ba9fc0f665fed4b63a
2019-06-04 20:29:05 -07:00
Lorenzo Colitti
ccf1e30fbf Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev am: f09098bacb
am: 27c3d9c177

Change-Id: I8e499af0eb8e37f93ba2fa29a0c9510a4e7163db
2019-06-04 19:15:01 -07:00
Lorenzo Colitti
72792e2f8f 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 9a79a6d41e)
2019-06-05 11:12:18 +09:00
Lorenzo Colitti
27c3d9c177 Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev
am: f09098bacb

Change-Id: Ifd9dbc9c83e426e66417247cbf1fa594193e000f
2019-06-04 18:29:51 -07:00
Lorenzo Colitti
e397214c8e 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 9a79a6d41e)
2019-06-05 01:17:28 +00:00
TreeHugger Robot
f09098bacb Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev 2019-06-04 18:00:31 +00:00
junyulai
d156f018c0 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: 30860cff94

Change-Id: Ie3def4fb2e5fd98f2f3d77ecbec98bd495aadeeb
2019-06-04 09:11:07 -07:00
junyulai
637cc6a2df Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb am: 0b8e9b043e
am: fd385c692f

Change-Id: If22a74559b3dd5ad0cd2dc7dd12becf2e0b1e59e
2019-06-04 09:08:35 -07:00
Android Build Merger (Role)
30860cff94 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
aa8394f506 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
fd385c692f Merge "Fix cannot create Nat-T keepalive on mobile data" into qt-dev am: eabafd5ceb
am: 0b8e9b043e

Change-Id: I5cc209e05eb91a368c94f76efc961ba5fd2750fb
2019-06-04 08:54:19 -07:00
junyulai
0b8e9b043e 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
9a79a6d41e 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
6b7cf0f2a9 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
fa5768a4a3 Merge "Fix cannot create Nat-T keepalive on mobile data" 2019-06-04 12:09:00 +00:00
junyulai
38c0624caf 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
8f5410ed01 Merge "Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev am: 5c355b31ea am: 74f7be63fc" into qt-r1-dev-plus-aosp
am: d2b77ddde2

Change-Id: Ia5d3be740cf1403832833328302eddaab92ed168
2019-06-03 17:25:27 -07:00