| commit | 90d1ffdcd84593ddbc7d2f7d1204c784c78fe2a3 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Thu Sep 29 06:09:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 29 06:09:56 2016 +0000 |
| tree | 98128b73276575045d9000fbe4faa817a4baa4dc | |
| parent | 8b5dcafc44a2a6cc284f2899952805c816e732f8 [diff] | |
| parent | 9fc1b97ca552104a135bddae5ee797e3cc60a0f8 [diff] |
New Settings symbols for captive portal detection am: e8b7aea6bb am: 4710228e81 am: 9fc1b97ca5 Change-Id: Iad6840b4edd243a77fe65a69a2f4dcba28e0a7cb
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index a2f3be7..fa2f6ac 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5502,7 +5502,7 @@ @Override public String getCaptivePortalServerUrl() { - return NetworkMonitor.getCaptivePortalServerUrl(mContext); + return NetworkMonitor.getCaptivePortalServerHttpUrl(mContext); } @Override