Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc20c794 authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Use the SSID of the network in the no internet dialog" into pi-dev 

am: 031bee8e

Change-Id: I1b437e107541f9789eb9e27461f8bb8a6874e997
parents 755426d7 031bee8e

src/com/android/settings/wifi/WifiNoInternetDialog.java

+5 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.net.Network; 
import android.net.NetworkCapabilities;

import android.net.NetworkInfo;

import android.net.NetworkRequest;

import android.net.wifi.WifiInfo;

import android.os.Bundle;

import android.provider.Settings;

import android.util.Log;
@@ -107,14 +108,15 @@ public final class WifiNoInternetDialog extends AlertActivity implements 
        mCM.registerNetworkCallback(request, mNetworkCallback);



        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);

            finish();

            return;

        }

        mNetworkName = ni.getExtraInfo();

        mNetworkName = nc.getSSID();

        if (mNetworkName != null) {

            mNetworkName = mNetworkName.replaceAll("^\"|\"$", "");  // Remove double quotes

            mNetworkName = WifiInfo.removeDoubleQuotes(mNetworkName);

        }



        createDialog();