diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-07-25 21:57:51 +0900 |
|---|---|---|
| committer | Hugo Benichi <hugobenichi@google.com> | 2017-07-28 09:17:20 +0900 |
| commit | 3cff783a05b325862be6729db36f4d48f68ec39e (patch) | |
| tree | 92bc9157c30d35586930597914544c4c74960b50 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3d1e1cc9db6e84c19274c431ffa3d32c1a95bed2 (diff) | |
NetworkNotificationManager: correctly handle existing notifications
This patch corrects a regression added by commit fb2609d3eee1 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 fb2609d3eee1, 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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions