tree 8e39b91d3935fa3ff990175457db30409d7ca7a9
parent 93ae16db0f0f7a813e51c47709940114560cd6d8
author Hugo Benichi <hugobenichi@google.com> 1497671253 +0900
committer Hugo Benichi <hugobenichi@google.com> 1497920744 +0900

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