diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-06-17 12:47:33 +0900 |
|---|---|---|
| committer | Hugo Benichi <hugobenichi@google.com> | 2017-06-20 10:05:44 +0900 |
| commit | c0abb4e4ff2b6516cb103bccfbf4f0ac03bd27c5 (patch) | |
| tree | 8e39b91d3935fa3ff990175457db30409d7ca7a9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 93ae16db0f0f7a813e51c47709940114560cd6d8 (diff) | |
CaptivePortalLogin correctly unregisters callbacks
The NetworkCallback registered by the CaptivePortalLogin activity in
onCreate was unregistered in both onDestroy() and done(). In addition
done() can be called concurrently from different places (from the
webview, from the captive portal test probe, from the activity menu),
resulting in incorrectly unregistering the callback more than once.
This patch fixes the lifecycle management of the NetworkCallback
registered by the CaptivePortalLogin activity so that it is unregistered
once only in onDestroy.
In addition the done() method is made robust against multiple calls and
becomes a no-op after the first call. This avoids multiple calls
to CaptivePortal for the same captive portal.
Bug: 62497809
Test: tested manually with captive portal setup in the office
Merged-In: I77fbeb55cf91d3b44e91d2fecb800dae40279652
(cherry pick from commit 31c176d91068934f5b79125afa3b5ce0f44dbe8f)
Change-Id: I34706201395ed5ddba11d12cc75c357e371d1920
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions