PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use the SSID of the network in the no internet dialog" into pi-dev am: 031bee8e6e

Browse Source 
am: dc20c794b8

Change-Id: I1727deb8f6298709f5629b734acf6b7a1f174bc2
This commit is contained in:
Chalard Jean
2018-04-16 19:57:20 -07:00
committed by android-build-merger
parent dd06c985c3 dc20c794b8
commit a035ca8748
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/WifiNoInternetDialog.java
View File

@@ -25,6 +25,7 @@ import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.wifi.WifiInfo;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.util.Log; import android.util.Log;
@@ -107,14 +108,15 @@ public final class WifiNoInternetDialog extends AlertActivity implements
mCM.registerNetworkCallback(request, mNetworkCallback); mCM.registerNetworkCallback(request, mNetworkCallback);
final NetworkInfo ni = mCM.getNetworkInfo(mNetwork); final NetworkInfo ni = mCM.getNetworkInfo(mNetwork);
if (ni == null || !ni.isConnectedOrConnecting()) { final NetworkCapabilities nc = mCM.getNetworkCapabilities(mNetwork);
if (ni == null || !ni.isConnectedOrConnecting() || nc == null) {
Log.d(TAG, "Network " + mNetwork + " is not connected: " + ni); Log.d(TAG, "Network " + mNetwork + " is not connected: " + ni);
finish(); finish();
return; return;
} }
mNetworkName = ni.getExtraInfo(); mNetworkName = nc.getSSID();
if (mNetworkName != null) { if (mNetworkName != null) {
mNetworkName = mNetworkName.replaceAll("^\"|\"$", ""); // Remove double quotes mNetworkName = WifiInfo.removeDoubleQuotes(mNetworkName);
} }
createDialog(); createDialog();