Merge "CaptivePortalLoginActivity correctly gets UserAgent" am: 4903487fd9 (4f9e934c) · Commits · e / os / android_frameworks_base

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -77,8 +77,8 @@ public class CaptivePortalLoginActivity extends Activity {
		mCm = ConnectivityManager.from(this);
		mNetwork = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
		mCaptivePortal = getIntent().getParcelableExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL);
		mUserAgent = getIntent().getParcelableExtra(
		ConnectivityManager.EXTRA_CAPTIVE_PORTAL_USER_AGENT);
		mUserAgent =
		getIntent().getStringExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL_USER_AGENT);
		mUrl = getUrl();
		if (mUrl == null) {
		// getUrl() failed to parse the url provided in the intent: bail out in a way that
		@@ -274,8 +274,17 @@ public class CaptivePortalLoginActivity extends Activity {
		if (mUserAgent != null) {
		urlConnection.setRequestProperty("User-Agent", mUserAgent);
		}
		// cannot read request header after connection
		String requestHeader = urlConnection.getRequestProperties().toString();

		urlConnection.getInputStream();
		httpResponseCode = urlConnection.getResponseCode();
		if (DBG) {
		Log.d(TAG, "probe at " + mUrl +
		" ret=" + httpResponseCode +
		" request=" + requestHeader +
		" headers=" + urlConnection.getHeaderFields());
		}
		} catch (IOException e) {
		} finally {
		if (urlConnection != null) urlConnection.disconnect();

+3 −0

Original line number	Diff line number	Diff line
		@@ -789,6 +789,8 @@ public class NetworkMonitor extends StateMachine {
		if (userAgent != null) {
		urlConnection.setRequestProperty("User-Agent", userAgent);
		}
		// cannot read request header after connection
		String requestHeader = urlConnection.getRequestProperties().toString();

		// Time how long it takes to get a response to our request
		long requestTimestamp = SystemClock.elapsedRealtime();
		@@ -802,6 +804,7 @@ public class NetworkMonitor extends StateMachine {
		validationLog(ValidationProbeEvent.getProbeName(probeType) + " " + url +
		" time=" + (responseTimestamp - requestTimestamp) + "ms" +
		" ret=" + httpResponseCode +
		" request=" + requestHeader +
		" headers=" + urlConnection.getHeaderFields());
		// NOTE: We may want to consider an "HTTP/1.0 204" response to be a captive
		// portal. The only example of this seen so far was a captive portal. For