Benedict Wong
9bd6c59fae
Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account." am: ebf6303f1d am: 74804a8abd
...
am: ef26279474
Change-Id: I6e9f5b04bbb036c13eedee6e8d079a48f14f5685
2019-06-07 02:48:33 -07:00
Benedict Wong
44bc14cb14
Revert "Addressing comments for http://ag/7700679 ." am: a293c0644b am: ec59f5f187
...
am: 999710a122
Change-Id: If2c644ab4b69f385a6e939ca4760530c196f098d
2019-06-07 02:48:29 -07:00
Benedict Wong
9369d55d3e
Revert "Add one more test for VPN usage stats." am: f97132185a am: 0d88389136
...
am: 1a5a76b3c2
Change-Id: I0f46aeeb024e7ca6e694ba8cdf0893b12dc12c0b
2019-06-07 02:48:23 -07:00
Benedict Wong
ef26279474
Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account." am: ebf6303f1d
...
am: 74804a8abd
Change-Id: I0bddf9f7c5bdd39eebec5dc6879336896d076e30
2019-06-07 02:43:29 -07:00
Benedict Wong
999710a122
Revert "Addressing comments for http://ag/7700679 ." am: a293c0644b
...
am: ec59f5f187
Change-Id: I5348233da5952b4d6cbbecda12c126f0aa4165ff
2019-06-07 02:43:25 -07:00
Benedict Wong
1a5a76b3c2
Revert "Add one more test for VPN usage stats." am: f97132185a
...
am: 0d88389136
Change-Id: I9061566f5d747e984fcbc8b3e0e428b75d02820b
2019-06-07 02:43:21 -07:00
Benedict Wong
74804a8abd
Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
...
am: ebf6303f1d
Change-Id: I9bf180aca56a8b5e2c5262beabac3ceaa9b00315
2019-06-07 02:33:30 -07:00
Benedict Wong
ec59f5f187
Revert "Addressing comments for http://ag/7700679 ."
...
am: a293c0644b
Change-Id: I56e7736ced431a5dcd78a6a258abfad09745d25e
2019-06-07 02:33:26 -07:00
Benedict Wong
0d88389136
Revert "Add one more test for VPN usage stats."
...
am: f97132185a
Change-Id: I72ae3f9575fe954f4f1db4b85b0f19d15448fbbf
2019-06-07 02:33:21 -07:00
Benedict Wong
ebf6303f1d
Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
...
This reverts commit e7094673d5 .
Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.
Bug: 134244752
Change-Id: I0c00e8f0e30cee987b71b561079a97bf09d4dae4
2019-06-07 09:17:47 +00:00
Benedict Wong
a293c0644b
Revert "Addressing comments for http://ag/7700679 ."
...
This reverts commit 78d5ac4f8f .
Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.
Bug: 134244752
Change-Id: I5fbb3443a39a21fc9d96442726cd10d20e8d61cd
2019-06-07 09:17:31 +00:00
Benedict Wong
f97132185a
Revert "Add one more test for VPN usage stats."
...
This reverts commit 20204cdf6a .
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
9e956ae405
Merge "Don't use a high-priority notification on auto-join." am: b1057f505a am: 3c695c1501 am: 85d0f3084e
...
am: 745f200a43
Change-Id: I6832e7c3c50a648a5583e36966753f7c4521431a
2019-06-07 01:53:44 -07:00
Lorenzo Colitti
745f200a43
Merge "Don't use a high-priority notification on auto-join." am: b1057f505a am: 3c695c1501
...
am: 85d0f3084e
Change-Id: I4d1d47a536e93403b5817acecbcdc54045e6cc38
2019-06-07 01:49:39 -07:00
Lorenzo Colitti
85d0f3084e
Merge "Don't use a high-priority notification on auto-join." am: b1057f505a
...
am: 3c695c1501
Change-Id: I2da85c5824c9a13c7f17a5872438dbd6490e7d58
2019-06-07 01:44:55 -07:00
Lorenzo Colitti
b1057f505a
Merge "Don't use a high-priority notification on auto-join."
2019-06-07 08:26:38 +00:00
Lorenzo Colitti
8a2348f222
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
8265d4ae44
Merge "Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c am: 3d54a3180b" into qt-r1-dev-plus-aosp
...
am: f3faaf7cfc
Change-Id: I9fda29c3da0a1ecdc7c5b616e1d0d364b797da71
2019-06-06 04:26:14 -07:00
Lorenzo Colitti
eb21c862ac
Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c am: 71feb6467f
...
am: 9a0d860735
Change-Id: I605c0570c51f718e0883f540999670768e0a2a4d
2019-06-06 04:24:44 -07:00
Android Build Merger (Role)
f3faaf7cfc
Merge "Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c am: 3d54a3180b" into qt-r1-dev-plus-aosp
2019-06-06 11:20:49 +00:00
Lorenzo Colitti
9a0d860735
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
42d668cd71
Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c76c
...
am: 3d54a3180b
Change-Id: Ia96c03d26ecbe0eb8f7d680b5f876d707127e03b
2019-06-06 04:19:43 -07:00
Lorenzo Colitti
3d54a3180b
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
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