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

Merge "Fix carrier app CaptivePortalLoginActivity probes to bypass Private DNS"

Browse Source 
am: 8e386b7132

Change-Id: I11062b03de5e02e87598fd5312e01e9695cecc35
This commit is contained in:
android-build-prod (mdb)
2018-04-26 19:20:21 -07:00
committed by android-build-merger
parent ae359622a6 8e386b7132
commit ee80dc68f4
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
View File

@@ -111,13 +111,11 @@ public class CaptivePortalLoginActivity extends Activity {
mWebView.setWebViewClient(mWebViewClient);
mWebView.setWebChromeClient(new MyWebChromeClient());
mNetwork = getNetworkForCaptivePortal();
if (mNetwork == null) {
final Network network = getNetworkForCaptivePortal();
if (network == null) {
requestNetworkForCaptivePortal();
} else {
mCm.bindProcessToNetwork(mNetwork);
mCm.setProcessDefaultNetworkForHostResolution(
ResolvUtil.getNetworkWithUseLocalNameserversFlag(mNetwork));
setNetwork(network);
// Start initial page load so WebView finishes loading proxy settings.
// Actual load of mUrl is initiated by MyWebViewClient.
mWebView.loadData("", "text/html", null);
@@ -159,6 +157,15 @@ public class CaptivePortalLoginActivity extends Activity {
super.onDestroy();
}
private void setNetwork(Network network) {
if (network != null) {
mCm.bindProcessToNetwork(network);
mCm.setProcessDefaultNetworkForHostResolution(
ResolvUtil.getNetworkWithUseLocalNameserversFlag(network));
}
mNetwork = network;
}
// Find WebView's proxy BroadcastReceiver and prompt it to read proxy system properties.
private void setWebViewProxy() {
LoadedApk loadedApk = getApplication().mLoadedApk;
@@ -235,6 +242,7 @@ public class CaptivePortalLoginActivity extends Activity {
private void testForCaptivePortal() {
mTestingThread = new Thread(new Runnable() {
public void run() {
final Network network = ResolvUtil.makeNetworkWithPrivateDnsBypass(mNetwork);
// Give time for captive portal to open.
try {
Thread.sleep(1000);
@@ -245,7 +253,7 @@ public class CaptivePortalLoginActivity extends Activity {
int httpResponseCode = 500;
int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PROBE);
try {
urlConnection = (HttpURLConnection) mNetwork.openConnection(
urlConnection = (HttpURLConnection) network.openConnection(
new URL(mCm.getCaptivePortalServerUrl()));
urlConnection.setInstanceFollowRedirects(false);
urlConnection.setConnectTimeout(SOCKET_TIMEOUT_MS);
@@ -292,8 +300,7 @@ public class CaptivePortalLoginActivity extends Activity {
@Override
public void onAvailable(Network network) {
if (DBG) logd("Network available: " + network);
mCm.bindProcessToNetwork(network);
mNetwork = network;
setNetwork(network);
runOnUiThreadIfNotFinishing(() -> {
if (mReload) {
mWebView.reload();