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

Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd

Browse Source 
am: 24912bb93d

Change-Id: Ief5a666699e64cf5d5fc79de1b7964f473898f78
This commit is contained in:
Hugo Benichi
2017-06-07 03:41:13 +00:00
committed by android-build-merger
parent 6f2d79464d 24912bb93d
commit 41415facc8
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/CaptivePortalLogin/res/values/strings.xml
View File

@@ -5,7 +5,6 @@
<string name="action_use_network">Use this network as is</string>
<string name="action_do_not_use_network">Do not use this network</string>
<string name="action_bar_label">Sign in to network</string>
<string name="action_bar_title">Sign in to %1$s</string>
<string name="ssl_error_warning">The network you&#8217;re trying to join has security issues.</string>
<string name="ssl_error_example">For example, the login page may not belong to the organization shown.</string>
<string name="ssl_error_continue">Continue anyway via browser</string>

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

@@ -26,7 +26,6 @@ import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.net.Proxy;
import android.net.Uri;
@@ -470,15 +469,7 @@ public class CaptivePortalLoginActivity extends Activity {
}
private String getHeaderTitle() {
NetworkInfo info = mCm.getNetworkInfo(mNetwork);
if (info == null) {
return getString(R.string.action_bar_label);
}
NetworkCapabilities nc = mCm.getNetworkCapabilities(mNetwork);
if (!nc.hasTransportType(NetworkCapabilities.TRANSPORT_WIFI)) {
return getString(R.string.action_bar_label);
}
return getString(R.string.action_bar_title, info.getExtraInfo().replaceAll("^\"|\"$", ""));
return getString(R.string.action_bar_label);
}
private String getHeaderSubtitle(String urlString) {