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

Merge "Fix NullPointerException in CaptivePortalLogin"

Browse Source
This commit is contained in:
Chalard Jean
2018-09-20 09:45:56 +00:00
committed by Gerrit Code Review
parent 7bd18423f6 67c1d26a07
commit d106aac67b
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,6 +130,22 @@ public class CaptivePortalLoginActivity extends Activity {
mProbeSpec = null; mProbeSpec = null;
} }
mNetworkCallback = new NetworkCallback() {
@Override
public void onLost(Network lostNetwork) {
// If the network disappears while the app is up, exit.
if (mNetwork.equals(lostNetwork)) done(Result.UNWANTED);
}
};
mCm.registerNetworkCallback(new NetworkRequest.Builder().build(), mNetworkCallback);
// If the network has disappeared, exit.
final NetworkCapabilities networkCapabilities = mCm.getNetworkCapabilities(mNetwork);
if (networkCapabilities == null) {
finishAndRemoveTask();
return;
}
// Also initializes proxy system properties. // Also initializes proxy system properties.
mNetwork = mNetwork.getPrivateDnsBypassingCopy(); mNetwork = mNetwork.getPrivateDnsBypassingCopy();
mCm.bindProcessToNetwork(mNetwork); mCm.bindProcessToNetwork(mNetwork);
@@ -139,24 +155,6 @@ public class CaptivePortalLoginActivity extends Activity {
// setContentView initializes the WebView logic which in turn reads the system properties. // setContentView initializes the WebView logic which in turn reads the system properties.
setContentView(R.layout.activity_captive_portal_login); setContentView(R.layout.activity_captive_portal_login);
// Exit app if Network disappears.
final NetworkCapabilities networkCapabilities = mCm.getNetworkCapabilities(mNetwork);
if (networkCapabilities == null) {
finishAndRemoveTask();
return;
}
mNetworkCallback = new NetworkCallback() {
@Override
public void onLost(Network lostNetwork) {
if (mNetwork.equals(lostNetwork)) done(Result.UNWANTED);
}
};
final NetworkRequest.Builder builder = new NetworkRequest.Builder();
for (int transportType : networkCapabilities.getTransportTypes()) {
builder.addTransportType(transportType);
}
mCm.registerNetworkCallback(builder.build(), mNetworkCallback);
getActionBar().setDisplayShowHomeEnabled(false); getActionBar().setDisplayShowHomeEnabled(false);
getActionBar().setElevation(0); // remove shadow getActionBar().setElevation(0); // remove shadow
getActionBar().setTitle(getHeaderTitle()); getActionBar().setTitle(getHeaderTitle());