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

Merge "Don't let sign-in to network app appear in recents when it finishes" into nyc-mr1-dev

Browse Source
This commit is contained in:
Paul Jensen
2016-07-26 14:26:29 +00:00
committed by Android (Google) Code Review
parent 7c731f9e1f 6a776c8317
commit c78bd7f01f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,7 @@ public class CaptivePortalLoginActivity extends Activity {
// Exit app if Network disappears. // Exit app if Network disappears.
final NetworkCapabilities networkCapabilities = mCm.getNetworkCapabilities(mNetwork); final NetworkCapabilities networkCapabilities = mCm.getNetworkCapabilities(mNetwork);
if (networkCapabilities == null) { if (networkCapabilities == null) {
finish(); finishAndRemoveTask();
return; return;
} }
mNetworkCallback = new NetworkCallback() { mNetworkCallback = new NetworkCallback() {
@@ -163,7 +163,7 @@ public class CaptivePortalLoginActivity extends Activity {
mCaptivePortal.useNetwork(); mCaptivePortal.useNetwork();
break; break;
} }
finish(); finishAndRemoveTask();
} }
@Override @Override