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

Commit 08bccd3b authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

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

am: 037503df

Change-Id: I008839786c3557f3dd418f8bb82f1cea0c27d3a1
parents 876bc4e8 037503df

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);