Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
335,227 Commits 3 Branches 0 Tags
8fa408caae8a28fd6e643f5e2c8c8a5c070df897
Commit Graph

537 Commits

Author SHA1 Message Date
Hugo Benichi
2b3e495224 Merge "NetworkNotificationManager: correctly handle existing notifications" am: 3451fb6156 am: ef7d6d93c3 am: 5cbf7e2dc8 
am: 1609fe7fe3

Change-Id: Ieed9e3e7755e0c5f89dc41ef66f47d4dbf4c66a9
 2017-07-27 15:08:19 +00:00
Hugo Benichi
1609fe7fe3 Merge "NetworkNotificationManager: correctly handle existing notifications" am: 3451fb6156 am: ef7d6d93c3 
am: 5cbf7e2dc8

Change-Id: I73cc879e910d503946facdba498b300337f349fd
 2017-07-27 14:58:32 +00:00
Hugo Benichi
5cbf7e2dc8 Merge "NetworkNotificationManager: correctly handle existing notifications" am: 3451fb6156 
am: ef7d6d93c3

Change-Id: I74631b0bfd14daf18a1641ed7f2ec323d636ebbf
 2017-07-27 14:50:14 +00:00
Hugo Benichi
ef7d6d93c3 Merge "NetworkNotificationManager: correctly handle existing notifications" 
am: 3451fb6156

Change-Id: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6
 2017-07-27 14:43:48 +00:00
Hugo Benichi
5fcd050e0e NetworkNotificationManager: correctly handle existing notifications 
This patch corrects a regression added by commit fb2609d3ee that did
not take into account the case of multiple notifications shown for a
single network id. Given how network notifications are triggered, it can
happen that NO_INTERNET and SIGN_IN notifications are both triggered for
the same network when captive portal detection is slow.

Contrary to the situation before commit fb2609d3ee, a notification
priority order is introduced so that SIGN_IN always overrides
NO_INTERNET, and NO_INTERNET is ignored if SIGN_IN is already present.

Bug: 63676954
Bug: 62503737
Test: runtest frameworks-net, added new unit tests
Change-Id: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531
 2017-07-27 21:20:20 +09:00
Hugo Benichi
2b691d874f Merge "Bootstrap IpReachabilityMonitor unit tests" am: a9889c94aa am: 39a707813b am: 5bc28905b6 
am: 9b88e173c7

Change-Id: I060c17bf421771dd09305696344cb77a4382b46e
 2017-07-25 14:51:40 +00:00
Hugo Benichi
9b88e173c7 Merge "Bootstrap IpReachabilityMonitor unit tests" am: a9889c94aa am: 39a707813b 
am: 5bc28905b6

Change-Id: I9ca394ccac1683d5d91b426582cfb3cddb5f5e96
 2017-07-25 14:45:35 +00:00
Hugo Benichi
5bc28905b6 Merge "Bootstrap IpReachabilityMonitor unit tests" am: a9889c94aa 
am: 39a707813b

Change-Id: Ie56377ae158d32a3592fd700e93fc827754ecaa3
 2017-07-25 14:39:40 +00:00
Hugo Benichi
39a707813b Merge "Bootstrap IpReachabilityMonitor unit tests" 
am: a9889c94aa

Change-Id: Ic3b145159a4c0430cc248a19b8527af40fa67696
 2017-07-25 14:33:45 +00:00
Hugo Benichi
06b1f2b173 Bootstrap IpReachabilityMonitor unit tests 
Bug: 62918393
Test: runtest frameworks-net

Change-Id: I236029f460dc3631ef9f5d8312dc1c6faf9807df
 2017-07-25 14:59:48 +09:00
Hugo Benichi
eff89fc84e Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 am: 8b8a0ef586 
am: 34ad34d199

Change-Id: Icf07be6dcb2bb87307b87af4ffed7d77413c49c7
 2017-07-21 08:33:46 +00:00
Hugo Benichi
34ad34d199 Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 
am: 8b8a0ef586

Change-Id: I63414de17f71be8f8e24296ba820f5e855f2975f
 2017-07-21 08:26:49 +00:00
Hugo Benichi
8b8a0ef586 Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 
am: 3d423c9c39

Change-Id: If8173e2b320e252ac9dcb95d1967472d505f1121
 2017-07-21 08:21:48 +00:00
Hugo Benichi
3d423c9c39 Merge "IpManagerTest: fix flaky test for real" 
am: e0a743d035

Change-Id: If1e0024d81bb24586f2cbd691e39a2d66f827c41
 2017-07-21 08:15:20 +00:00
Treehugger Robot
e0a743d035 Merge "IpManagerTest: fix flaky test for real" 2017-07-21 08:07:40 +00:00
Hugo Benichi
e9bdc19a43 IpManagerTest: fix flaky test for real 
Commit c10fe5f463 tried to fix the flaky unit test for a default
ProvisioningConfiguration but failed to reinitialize the mock class
involved, so that in practice the flaky assertion is as flaky as before.

This patch correctly resets the mock after the default assertions are
done once an IpManager object is created.

Bug: 32561414
Bug: 62918393
Test: runtest frameworks-net
Change-Id: I516b6981f96e83a90cb372a727c41f0b2ea59801
 2017-07-21 14:14:25 +09:00
Di Lu
b29659421e Merge "Add unit test for IpSecService" am: 9e3f886dca am: 3182454f28 am: 345db82674 
am: 636033782b

Change-Id: I788e4e8466a76f80d1f15330e6d3b91b73be1d32
 2017-07-20 08:42:27 +00:00
Di Lu
3eedbf543c Merge "Add unit test for IpSecManager" am: dd494fa91c am: 73b7292a05 am: eb7bc05b32 
am: aadf75714a

Change-Id: Iecf36183010f78920ef4112b9b0a0febf4ece82c
 2017-07-20 08:38:36 +00:00
Di Lu
636033782b Merge "Add unit test for IpSecService" am: 9e3f886dca am: 3182454f28 
am: 345db82674

Change-Id: Ia4d85bcf5c42774d7b48cb1cd648754b6dd16b69
 2017-07-20 07:50:21 +00:00
Di Lu
345db82674 Merge "Add unit test for IpSecService" am: 9e3f886dca 
am: 3182454f28

Change-Id: Iee7cc50b7f4715d9c6797356be5cac705407d4bc
 2017-07-20 07:43:12 +00:00
Di Lu
3182454f28 Merge "Add unit test for IpSecService" 
am: 9e3f886dca

Change-Id: I16fb89239e641ac39a8a7adeafd72b7fe03935ed
 2017-07-20 07:36:19 +00:00
Di Lu
9e3f886dca Merge "Add unit test for IpSecService" 2017-07-20 07:27:16 +00:00
Di Lu
aadf75714a Merge "Add unit test for IpSecManager" am: dd494fa91c am: 73b7292a05 
am: eb7bc05b32

Change-Id: I399513b63dd5c06bab2946be315cc5c5689dff29
 2017-07-20 06:04:11 +00:00
Di Lu
eb7bc05b32 Merge "Add unit test for IpSecManager" am: dd494fa91c 
am: 73b7292a05

Change-Id: I33cb28b9ca07126e4f1b2631604fccf94ae4b530
 2017-07-20 05:57:40 +00:00
Di Lu
73b7292a05 Merge "Add unit test for IpSecManager" 
am: dd494fa91c

Change-Id: I56c336eb8234b31154b6a7defd95ce76ea0800d8
 2017-07-20 05:52:10 +00:00
Di Lu
dd494fa91c Merge "Add unit test for IpSecManager" 2017-07-20 05:42:53 +00:00
ludi
1a06aa75e5 Add unit test for IpSecService 
Test: runtest frameworks-net

Bug:38259578
Change-Id: I4a049d5fdec79e36692e3b12306bd0758c19ad75
 2017-07-20 04:26:24 +00:00
Ahmed ElArabawy
2d0f47c40f Merge "Add Configuration to APF Policy" am: d27a6d62c6 
am: 70291ef1d7

Change-Id: Ib2881c42b6eb149ac4f964d9d8d29ac74a057000
 2017-07-20 03:54:03 +00:00
Ahmed ElArabawy
70291ef1d7 Merge "Add Configuration to APF Policy" 
am: d27a6d62c6

Change-Id: I491bad86e4e9ae7a813ac214b06273719a583079
 2017-07-20 03:46:08 +00:00
Treehugger Robot
d27a6d62c6 Merge "Add Configuration to APF Policy" 2017-07-20 03:34:57 +00:00
Ahmed ElArabawy
8537c58cc8 Add Configuration to APF Policy 
in b/37702435 battery was drained due to reception of
Ethernet frames with Eth-type < 0x600 (non ehternet II frames)

This change adds an XML file to drop/allow these frames
Dropping helps tp avoid acquiring a wakelock for the
reception of these packets, while allowing them may be needed
for some protocols
The Change allow the OEM to override the system settings

Bug: 37702435
Test: runtest frameworks-net
Merged-In: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d
Merged-In: I16346bb98a0b9259f7c3f51e318c472cfc1bb492

Signed-off-by: Ahmed ElArabawy <arabawy@google.com>

(cherry pick from commit 4dd7c58fc8)

Change-Id: Ie466baf1e6395d6c28245e41179232ea8e523845
 2017-07-20 11:22:46 +09:00
ludi
90de61b3ed Add unit test for IpSecManager 
Test: runtest frameworks-net

Bug:38259578
Change-Id: Idb76aab899ccb7145bef2b7dce36e115c25fa6ca
 2017-07-19 18:59:12 -07:00
Ahmed ElArabawy
e9685cab9a Merge "Add Configuration to APF Policy" into oc-dr1-dev am: 1da6af31ff 
am: 1885632105

Change-Id: I5949798a6531344ed90301f452165838fa8adb6a
 2017-07-19 22:17:21 +00:00
Ahmed ElArabawy
1885632105 Merge "Add Configuration to APF Policy" into oc-dr1-dev 
am: 1da6af31ff

Change-Id: I16346bb98a0b9259f7c3f51e318c472cfc1bb492
 2017-07-19 22:11:40 +00:00
TreeHugger Robot
1da6af31ff Merge "Add Configuration to APF Policy" into oc-dr1-dev 2017-07-19 22:02:09 +00:00
Hugo Benichi
c948cfab40 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 24a2adfa27 am: f6883504c2 am: b1894abbc5 
am: 443f3aa138

Change-Id: I7d3bfdf6d95d5db2d31439b5c3334569666864e1
 2017-07-19 08:20:23 +00:00
Hugo Benichi
443f3aa138 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 24a2adfa27 am: f6883504c2 
am: b1894abbc5

Change-Id: I458a0fdae874039e0f1d5cd38ed8ad0a1754bba9
 2017-07-19 08:15:12 +00:00
Hugo Benichi
b1894abbc5 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 24a2adfa27 
am: f6883504c2

Change-Id: I432f419d1c8f93136a76cbadfd32018294b3e3d7
 2017-07-19 08:09:38 +00:00
Hugo Benichi
f6883504c2 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" 
am: 24a2adfa27

Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321
 2017-07-19 08:04:48 +00:00
Hugo Benichi
c1014509d8 ConnectivityServiceTest: fix testNetworkInfoOfTypeNone 
This patch fixes a couple of flakyness issues with
testNetworkInfoOfTypeNone. It also fixes some typos and naming issues.

Bug: 62918393, 62918393
Test: runtest frameworks-net
Change-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09
 2017-07-19 15:08:49 +09:00
Hugo Benichi
31097a6341 Merge "IpManager: fix test for default ProvisioningConfiguration" am: 2627d4856b am: 361162b636 am: fe88fa947e 
am: 93c5a4b389

Change-Id: I7c66b30f5f7961900c3b5a5baf0c14644cbcb69e
 2017-07-19 01:31:28 +00:00
Hugo Benichi
93c5a4b389 Merge "IpManager: fix test for default ProvisioningConfiguration" am: 2627d4856b am: 361162b636 
am: fe88fa947e

Change-Id: I4bbbf0997f5bf9a1ebba1eb9968471fff9f297fe
 2017-07-19 01:22:59 +00:00
Hugo Benichi
fe88fa947e Merge "IpManager: fix test for default ProvisioningConfiguration" am: 2627d4856b 
am: 361162b636

Change-Id: Id72cd94c481bdc106ed022582399687b9abcc22b
 2017-07-19 01:15:12 +00:00
Hugo Benichi
361162b636 Merge "IpManager: fix test for default ProvisioningConfiguration" 
am: 2627d4856b

Change-Id: I087aee995858ae898f5d660c11552724a07503c3
 2017-07-19 01:06:59 +00:00
Treehugger Robot
2627d4856b Merge "IpManager: fix test for default ProvisioningConfiguration" 2017-07-19 00:58:11 +00:00
Lorenzo Colitti
6a5fe34edf resolve merge conflicts of a1d67fb38e to stage-aosp-master 
am: 8228eb3446

Change-Id: Ic9ba31da8e5281c9dbc8fa7ff56a63956a495b72
 2017-07-18 23:37:57 +00:00
Lorenzo Colitti
8228eb3446 resolve merge conflicts of a1d67fb38e to stage-aosp-master 
Test: make -j64 services
Change-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b
Merged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
 2017-07-19 07:35:31 +09:00
Charles He
fa9c0be357 Merge "Opt-out for always-on VPN" 2017-07-18 18:47:45 +00:00
Lorenzo Colitti
4ca0ba8f86 Fetch tethering offload stats. 
Make tethering offload register an ITetheringStatsProvider and
fetch tethering stats from the hardware.

Currently we fetch stats in the following cases:

1. Just after changing upstreams, we fetch stats from the
   previous upstream.
2. When we are polled by NetworkStatsService.

(cherry-picked from commit 5a7dea1a8e)

Bug: 29337859
Bug: 32163131
Test: builds, boots
Test: stats appear in tethering logs
Change-Id: If744f2e06cb6a3095a40199936b9afb76eff7b56
Merged-In: If744f2e06cb6a3095a40199936b9afb76eff7b56
 2017-07-19 00:55:37 +09:00
Hugo Benichi
c10fe5f463 IpManager: fix test for default ProvisioningConfiguration 
The test did not properly account for the stopAllIP() done in starting
state of the IpManager state machine, which could cause assertions to
fail when stopAllIP() is called again after stop().

Bug: 62988545
Test: runtest frameworks-net
Change-Id: I2c6eb76461a81c1d743bf448da36c58a99ce082d
 2017-07-18 21:31:17 +09:00