Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CaptivePortalLoginActivity correctly gets UserAgent"

Browse Source
This commit is contained in:
Treehugger Robot
2017-03-09 10:03:26 +00:00
committed by Gerrit Code Review
parent 4a75e32f1d ec88fd6708
commit 4903487fd9
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
View File

@@ -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
services/core/java/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -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