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

Merge "reloading the current page on Network lost->avail" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-01 18:54:49 +00:00
committed by Android (Google) Code Review
parent 6f8afdc501 1c0a86fc6e
commit 3f9faf6df4
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,7 @@ public class CaptivePortalLoginActivity extends Activity {
private MyWebViewClient mWebViewClient;
private boolean mLaunchBrowser = false;
private Thread mTestingThread = null;
private boolean mReload = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -290,9 +291,13 @@ public class CaptivePortalLoginActivity extends Activity {
mCm.bindProcessToNetwork(network);
mNetwork = network;
runOnUiThreadIfNotFinishing(() -> {
// Start initial page load so WebView finishes loading proxy settings.
// Actual load of mUrl is initiated by MyWebViewClient.
mWebView.loadData("", "text/html", null);
if (mReload) {
mWebView.reload();
} else {
// Start initial page load so WebView finishes loading proxy settings.
// Actual load of mUrl is initiated by MyWebViewClient.
mWebView.loadData("", "text/html", null);
}
});
}
@@ -305,6 +310,12 @@ public class CaptivePortalLoginActivity extends Activity {
mWebView.loadUrl(mUrl.toString());
});
}
@Override
public void onLost(Network lostNetwork) {
if (DBG) logd("Network lost");
mReload = true;
}
};
logd("request Network for captive portal");
mCm.requestNetwork(request, mNetworkCallback, NETWORK_REQUEST_TIMEOUT_MS);