diff options
| author | Narayan Kamath <narayan@google.com> | 2013-08-29 13:40:43 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2013-10-16 08:10:55 +0000 |
| commit | 98e1797367ca8cd8b8476f6befdb55f81cd13e19 (patch) | |
| tree | e10a92044f2a8f9d8747a2fde3d361537f6ffb66 /core/java/android/net/MobileDataStateTracker.java | |
| parent | 805f7a1d0140c2ad9ad214e5329e1a6a26fb5134 (diff) | |
Remove captive portal code that has no effect.
Note that this CL does not change any behaviour.
At the center of this change is
CaptivePortalTracker#detectCaptivePortal(), which does nothing
except call back into ConnectivityService. Removing it allows us to
simplify code in ConnectivityService. It also allows us to remove
ConnectivityService#captivePortalCheckComplete which was only ever
called in response to this method.
While this does not change any behaviour, it preserves existing
bad behaviour, i.e, that the CAPTIVE_PORTAL_CHECK NetworkInfo
state does not correspond to actual captive portal detection.
We transition into that state and immediately (and unconditionally)
out of it and into CONNECTED.
Change-Id: Ib3797f956d2db5e3cacaaa53e899d81aa8e958af
Diffstat (limited to 'core/java/android/net/MobileDataStateTracker.java')
| -rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index c1065145dbf2..d9c35c02f340 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -460,11 +460,6 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { } @Override - public void captivePortalCheckComplete() { - // not implemented - } - - @Override public void captivePortalCheckCompleted(boolean isCaptivePortal) { if (mIsCaptivePortal.getAndSet(isCaptivePortal) != isCaptivePortal) { // Captive portal change enable/disable failing fast |