LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,973 Commits 2 Branches 0 Tags
f8e88f5d3466db6ece9353c839c9ebaebcc7c9e3
Commit Graph

3973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugo Benichi
f8e88f5d34 Merge "Logging improvements when NetworkCapabilities change" am: 59e6fc6d27 am: ba6bae1db3 am: 88a572da7d -s ours am: ce2547965f -s ours 
am: 43f7dfa3fc  -s ours

Change-Id: Ib20ff1f481753b97ad31e17907567f3c4ed12f6c
 2017-07-31 02:19:17 +00:00
Hugo Benichi
43f7dfa3fc Merge "Logging improvements when NetworkCapabilities change" am: 59e6fc6d27 am: ba6bae1db3 am: 88a572da7d -s ours 
am: ce2547965f  -s ours

Change-Id: Ia69626f61d00be9a6da3655111999f70423325c9
 2017-07-31 02:13:17 +00:00
Hugo Benichi
ce2547965f Merge "Logging improvements when NetworkCapabilities change" am: 59e6fc6d27 am: ba6bae1db3 
am: 88a572da7d  -s ours

Change-Id: I5f6e3a2109236f30d0e09bde8a2c63b32e62f772
 2017-07-31 02:07:12 +00:00
Hugo Benichi
ba6bae1db3 Merge "Logging improvements when NetworkCapabilities change" 
am: 59e6fc6d27

Change-Id: I886e39db8969eb1ac1dfe06c6f448e53a90fd92c
 2017-07-31 01:50:38 +00:00
Treehugger Robot
59e6fc6d27 Merge "Logging improvements when NetworkCapabilities change" 2017-07-31 01:38:29 +00:00
Hugo Benichi
e06963a7ff Logging improvements when NetworkCapabilities change 
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.

Bug: 63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Merged-In: I05c6e78891e1eac658f1cf883223af520a9a4f8f
Merged-In: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
Merged-In: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
Merged-In: Iec6d92e9a3a12bab87c5adfaf17f776465077060
Merged-In: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
Merged-In: I38739184fc0db105bfd3b4c02cce01e803739e5d
Merged-In: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c

(cherry pick from commit d9806e8014)

Change-Id: Id32ca66068c8ff549627e8e8c0e50897ef928c58
 2017-07-31 09:25:37 +09:00
Hugo Benichi
51a77ff1da Merge "Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 8a8c295879 am: 00709696a9" into oc-mr1-dev-plus-aosp 
am: 8c92a383a7

Change-Id: Ia58b877056e2442136cc8b145ac8f4e6560cfc2c
 2017-07-29 00:15:04 +00:00
Hugo Benichi
339b1dc009 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 8a8c295879 am: 3d722e38f3 
am: 8563e2100a

Change-Id: I38739184fc0db105bfd3b4c02cce01e803739e5d
 2017-07-29 00:11:12 +00:00
Android Build Merger (Role)
8c92a383a7 Merge "Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 8a8c295879 am: 00709696a9" into oc-mr1-dev-plus-aosp 2017-07-29 00:06:58 +00:00
Hugo Benichi
c35956e5c3 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 8a8c295879 
am: 00709696a9

Change-Id: I633d6347a7f852c27c03fc96b36ca2a60f70c73c
 2017-07-29 00:03:33 +00:00
Hugo Benichi
8563e2100a Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 8a8c295879 
am: 3d722e38f3

Change-Id: Iec6d92e9a3a12bab87c5adfaf17f776465077060
 2017-07-29 00:03:27 +00:00
Hugo Benichi
00709696a9 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev 
am: 8a8c295879

Change-Id: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae
 2017-07-28 23:54:05 +00:00
Hugo Benichi
3d722e38f3 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev 
am: 8a8c295879

Change-Id: I4f6cbc0adb461cef6610460daeba72ca38b8f10c
 2017-07-28 23:54:03 +00:00
Hugo Benichi
8a8c295879 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev 2017-07-28 23:42:59 +00:00
Hugo Benichi
d9806e8014 Logging improvements when NetworkCapabilities change 
This patch improves the wtf() logging in updateCapabilities to
better distinguish between the cases of a changed specifiers, changed
transports, or changed capabilities. The case of NOT_METERED being added
or removed is ignored.

Bug: 63326103
Test: runtest frameworks-net, runtest frameworks-wifi
Change-Id: I05c6e78891e1eac658f1cf883223af520a9a4f8f
 2017-07-28 15:25:54 +09:00
Hugo Benichi
fe259b49aa Merge "Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev am: a03bf7acd1 -s ours am: ec9236f68f -s ours" into oc-mr1-dev-plus-aosp 
am: 4753f74e83  -s ours

Change-Id: I43c0b5a6f7b5227c7b01f092b96112875cad1ac2
 2017-07-28 05:00:59 +00:00
Hugo Benichi
b7bc53a6fe Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev am: a03bf7acd1 am: 7ae02714ae -s ours 
am: c62c792171  -s ours

Change-Id: Ib04804cffa258bd7e2f9fdadadfe59ba67302a44
 2017-07-28 04:54:01 +00:00
Android Build Merger (Role)
4753f74e83 Merge "Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev am: a03bf7acd1 -s ours am: ec9236f68f -s ours" into oc-mr1-dev-plus-aosp 2017-07-28 04:49:25 +00:00
Hugo Benichi
c62c792171 Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev am: a03bf7acd1 
am: 7ae02714ae  -s ours

Change-Id: I98c775f946704f49d1986502aab97799e9ce15f6
 2017-07-28 04:46:54 +00:00
Hugo Benichi
091bfd8471 Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev am: a03bf7acd1 -s ours 
am: ec9236f68f  -s ours

Change-Id: I3919b9b9f1f94fc7e8137dbd7ff1d71b2ca297b3
 2017-07-28 04:46:54 +00:00
Hugo Benichi
7ae02714ae Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev 
am: a03bf7acd1

Change-Id: I4ca3dcc293be5408a6f207e1ac1a7229a915723a
 2017-07-28 04:39:14 +00:00
Hugo Benichi
ec9236f68f Merge "NetworkNotificationManager: correctly handle existing notifications" into oc-dr1-dev 
am: a03bf7acd1  -s ours

Change-Id: I13204ae131642c95df242245764689294b0fd85f
 2017-07-28 04:38:25 +00:00
Hugo Benichi
900a3dbcc0 NetworkNotificationManager: correctly handle existing notifications 
This patch corrects a regression added by commit fd35080555 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 fd35080555, 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
Merged-In: Ib8658601e8d4dc6c41b335ab7dd8caa0cccd9531
Merged-In: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6
Merged-In: I74631b0bfd14daf18a1641ed7f2ec323d636ebbf
Merged-In: I73cc879e910d503946facdba498b300337f349fd
Merged-In: Ieed9e3e7755e0c5f89dc41ef66f47d4dbf4c66a9
Merged-In: I0aa590170f1bd4c37175c7e35e54d52f1fb21347

(cherry picked from commit 5fcd050e0ecd5985cf184f55ea3df4434da8f824)

Change-Id: I41675768ab59e9b23ca4275edf297b82595e5730
 2017-07-28 09:17:20 +09:00
Hugo Benichi
1c30db4c83 Merge "NetworkNotificationManager: correctly handle existing notifications" am: 3451fb6156 am: 7e994d3eaa am: 5cbf7e2dc8 am: b43581504b 
am: 8419aca5fe

Change-Id: I0aa590170f1bd4c37175c7e35e54d52f1fb21347
 2017-07-27 15:18:47 +00:00
Hugo Benichi
8419aca5fe Merge "NetworkNotificationManager: correctly handle existing notifications" am: 3451fb6156 am: 7e994d3eaa am: 5cbf7e2dc8 
am: b43581504b

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

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

Change-Id: I4432f66067ea1ab02e1d2dfe42530bcdafa52df6
 2017-07-27 14:43:48 +00:00
Hugo Benichi
1fc19b9823 NetworkNotificationManager: correctly handle existing notifications 
This patch corrects a regression added by commit fd35080555 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 fd35080555, 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
Di Lu
505683bef3 Merge "Add unit test for IpSecService" am: 58bfe539aa am: 3f5f9e1492 am: 345db82674 am: 7547060657 
am: a37e02acb6

Change-Id: Icc0e4440b695095acdcd6fb11664c230dafd2a22
 2017-07-20 08:50:39 +00:00
Di Lu
53adf36509 Merge "Add unit test for IpSecManager" am: 64d4939d07 am: 9ca5b3e1de am: eb7bc05b32 am: e073f8ae6a 
am: c045847be4

Change-Id: I9a4c6d74f2fb6e2fb98308546b3bd26f7858057c
 2017-07-20 08:49:14 +00:00
Di Lu
a37e02acb6 Merge "Add unit test for IpSecService" am: 58bfe539aa am: 3f5f9e1492 am: 345db82674 
am: 7547060657

Change-Id: I788e4e8466a76f80d1f15330e6d3b91b73be1d32
 2017-07-20 08:42:27 +00:00
Di Lu
c045847be4 Merge "Add unit test for IpSecManager" am: 64d4939d07 am: 9ca5b3e1de am: eb7bc05b32 
am: e073f8ae6a

Change-Id: Iecf36183010f78920ef4112b9b0a0febf4ece82c
 2017-07-20 08:38:36 +00:00
Di Lu
7547060657 Merge "Add unit test for IpSecService" am: 58bfe539aa am: 3f5f9e1492 
am: 345db82674

Change-Id: Ia4d85bcf5c42774d7b48cb1cd648754b6dd16b69
 2017-07-20 07:50:21 +00:00
Di Lu
3f5f9e1492 Merge "Add unit test for IpSecService" 
am: 58bfe539aa

Change-Id: I16fb89239e641ac39a8a7adeafd72b7fe03935ed
 2017-07-20 07:36:19 +00:00
Di Lu
58bfe539aa Merge "Add unit test for IpSecService" 2017-07-20 07:27:16 +00:00
Di Lu
5e0c27aba0 Merge "Add unit test for IpSecManager" am: 64d4939d07 am: 9ca5b3e1de am: eb7bc05b32 
am: e073f8ae6a

Change-Id: Ic2bfa2f8440f9dce1f218fccde1674ac76e81fe3
 2017-07-20 06:27:25 +00:00
Di Lu
e073f8ae6a Merge "Add unit test for IpSecManager" am: 64d4939d07 am: 9ca5b3e1de 
am: eb7bc05b32

Change-Id: I399513b63dd5c06bab2946be315cc5c5689dff29
 2017-07-20 06:04:11 +00:00
Di Lu
9ca5b3e1de Merge "Add unit test for IpSecManager" 
am: 64d4939d07

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

Bug:38259578
Change-Id: I4a049d5fdec79e36692e3b12306bd0758c19ad75
 2017-07-20 04:26:24 +00:00
Steven Moreland
4f252f629f Merge "frameworks/base: use proper nativehelper headers" am: 80c9a74da8 am: d4a4d12451 am: c840945a78 
am: bdf39c32ea

Change-Id: Ibe321dd4a8aae9342c76da0780edf94b90e8cd3a
 2017-07-20 03:11:00 +00:00
Steven Moreland
bdf39c32ea Merge "frameworks/base: use proper nativehelper headers" am: 80c9a74da8 am: d4a4d12451 
am: c840945a78

Change-Id: I654e14f0d1b495450db81592a2e564e308746350
 2017-07-20 03:05:02 +00:00
Steven Moreland
d4a4d12451 Merge "frameworks/base: use proper nativehelper headers" 
am: 80c9a74da8

Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
 2017-07-20 02:50:53 +00:00
Treehugger Robot
80c9a74da8 Merge "frameworks/base: use proper nativehelper headers" 2017-07-20 02:42:49 +00:00
ludi
50c2767142 Add unit test for IpSecManager 
Test: runtest frameworks-net

Bug:38259578
Change-Id: Idb76aab899ccb7145bef2b7dce36e115c25fa6ca
 2017-07-19 18:59:12 -07:00
Steven Moreland
b9e50d94d1 frameworks/base: use proper nativehelper headers 
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: modules using frameworks/base find headers
Bug: 63762847
Change-Id: I0f9f231acdebe460f279135462f43d3e32eff64d
 2017-07-19 10:06:40 -07:00
Hugo Benichi
90217e1808 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 1f0d765378 am: 9efd050236 am: b1894abbc5 
am: fecebf94a2

Change-Id: I7d3bfdf6d95d5db2d31439b5c3334569666864e1
 2017-07-19 08:20:23 +00:00
Hugo Benichi
fecebf94a2 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am: 1f0d765378 am: 9efd050236 
am: b1894abbc5

Change-Id: I458a0fdae874039e0f1d5cd38ed8ad0a1754bba9
 2017-07-19 08:15:12 +00:00
Hugo Benichi
9efd050236 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" 
am: 1f0d765378

Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321
 2017-07-19 08:04:48 +00:00
Treehugger Robot
1f0d765378 Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" 2017-07-19 07:54:45 +00:00