diff --git a/packages/CaptivePortalLogin/res/values/strings.xml b/packages/CaptivePortalLogin/res/values/strings.xml index f486fe4c5ddf8..b1a3852a7a8d7 100644 --- a/packages/CaptivePortalLogin/res/values/strings.xml +++ b/packages/CaptivePortalLogin/res/values/strings.xml @@ -5,7 +5,6 @@ Use this network as is Do not use this network Sign in to network - Sign in to %1$s The network you’re trying to join has security issues. For example, the login page may not belong to the organization shown. Continue anyway via browser diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java index 9b018161bdf73..3601a0aa57461 100644 --- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java +++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java @@ -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) {