Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 037503df authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "fix cellular captive portal reevaluation url" into oc-dr1-dev

parents 88da234e c457a04d

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -226,7 +226,8 @@ public class CaptivePortalLoginActivity extends Activity { 
                int httpResponseCode = 500;

                int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PROBE);

                try {

                    urlConnection = (HttpURLConnection) mNetwork.openConnection(mUrl);

                    urlConnection = (HttpURLConnection) mNetwork.openConnection(

                            new URL(mCm.getCaptivePortalServerUrl()));

                    urlConnection.setInstanceFollowRedirects(false);

                    urlConnection.setConnectTimeout(SOCKET_TIMEOUT_MS);

                    urlConnection.setReadTimeout(SOCKET_TIMEOUT_MS);
@@ -234,6 +235,7 @@ public class CaptivePortalLoginActivity extends Activity { 
                    urlConnection.getInputStream();

                    httpResponseCode = urlConnection.getResponseCode();

                } catch (IOException e) {

                    loge(e.getMessage());

                } finally {

                    if (urlConnection != null) urlConnection.disconnect();

                    TrafficStats.setThreadStatsTag(oldTag);