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

Commit 08e42fa9 authored by Quang Luong's avatar Quang Luong Committed by Android (Google) Code Review
Browse files

Merge changes from topic "StaleWifiEntries" into sc-dev 

* changes:
  Add 6 GHz Wifi band to Wifi Network Details
  Do not delay updating WifiEntries for first onWifiEntriesUpdated()
parents 2968c05f 1c7ba386

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -2014,10 +2014,12 @@ 
    <string name="wifi_display_listen_channel" translatable="false">Listen channel</string>

    <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->

    <string name="wifi_display_operating_channel" translatable="false">Operating channel</string>

    <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->

    <!-- Wifi 2.4GHz is used as a universal identifier for 2.4GHz band -->

    <string name="wifi_band_24ghz">2.4 GHz</string>

    <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->

    <!-- Wifi Internal 5GHz as a universal identifier for 5GHz band -->

    <string name="wifi_band_5ghz">5 GHz</string>

    <!-- Wifi 6GHz is used as a universal identifier for 6GHz band [CHAR LIMIT=40] -->

    <string name="wifi_band_6ghz">6 GHz</string>

    <!-- Wifi Sign in text for button [CHAR LIMIT = 40]-->

    <string name="wifi_sign_in_button_text">Sign in</string>

    <!-- Text for button to go to Wifi venue information webpage when Wifi is a captive portal [CHAR LIMIT=40]-->

src/com/android/settings/network/NetworkProviderSettings.java

+8 −1
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
        return WifiPickerTracker.isVerboseLoggingEnabled();

    }



    private boolean mIsWifiEntryListStale = true;

    private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {

        updateWifiEntryPreferences();

    };
@@ -437,6 +438,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 


    @Override

    public void onStop() {

        mIsWifiEntryListStale = true;

        getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);

        getView().removeCallbacks(mHideProgressBarRunnable);

        mAirplaneModeEnabler.stop();
@@ -698,7 +700,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 


    @Override

    public void onWifiEntriesChanged() {

        if (mIsWifiEntryListStale) {

            mIsWifiEntryListStale = false;

            updateWifiEntryPreferences();

        } else {

            updateWifiEntryPreferencesDelayed();

        }

        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);



        // Edit the Wi-Fi network of specified SSID.

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

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.wifi;



import android.app.Activity;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -35,7 +34,6 @@ import android.net.wifi.WifiEnterpriseConfig.Eap; 
import android.net.wifi.WifiEnterpriseConfig.Phase2;

import android.net.wifi.WifiManager;

import android.os.IBinder;

import android.os.UserHandle;

import android.security.keystore.KeyProperties;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;
@@ -402,6 +400,9 @@ public class WifiConfigController2 implements TextWatcher, 
                        } else if (frequency >= WifiEntry.MIN_FREQ_5GHZ

                                && frequency < WifiEntry.MAX_FREQ_5GHZ) {

                            band = res.getString(R.string.wifi_band_5ghz);

                        } else if (frequency >= WifiEntry.MIN_FREQ_6GHZ

                                && frequency < WifiEntry.MAX_FREQ_6GHZ) {

                            band = res.getString(R.string.wifi_band_6ghz);

                        } else {

                            Log.e(TAG, "Unexpected frequency " + frequency);

                        }

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

+8 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
        return WifiPickerTracker.isVerboseLoggingEnabled();

    }



    private boolean mIsWifiEntryListStale = true;

    private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {

        updateWifiEntryPreferences();

    };
@@ -421,6 +422,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
    public void onStop() {

        getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);

        getView().removeCallbacks(mHideProgressBarRunnable);

        mIsWifiEntryListStale = true;

        super.onStop();

    }
@@ -678,7 +680,12 @@ public class WifiSettings extends RestrictedSettingsFragment 


    @Override

    public void onWifiEntriesChanged() {

        if (mIsWifiEntryListStale) {

            mIsWifiEntryListStale = false;

            updateWifiEntryPreferences();

        } else {

            updateWifiEntryPreferencesDelayed();

        }

        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);



        // Edit the Wi-Fi network of specified SSID.

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+4 −0
Original line number Diff line number Diff line
@@ -623,12 +623,16 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 
            return;

        }



        // TODO(b/190390803): We should get the band string directly from WifiEntry.ConnectedInfo

        //                    instead of doing the frequency -> band conversion here.

        final int frequency = connectedInfo.frequencyMhz;

        String band = null;

        if (frequency >= WifiEntry.MIN_FREQ_24GHZ && frequency < WifiEntry.MAX_FREQ_24GHZ) {

            band = mContext.getResources().getString(R.string.wifi_band_24ghz);

        } else if (frequency >= WifiEntry.MIN_FREQ_5GHZ && frequency < WifiEntry.MAX_FREQ_5GHZ) {

            band = mContext.getResources().getString(R.string.wifi_band_5ghz);

        } else if (frequency >= WifiEntry.MIN_FREQ_6GHZ && frequency < WifiEntry.MAX_FREQ_6GHZ) {

            band = mContext.getResources().getString(R.string.wifi_band_6ghz);

        } else {

            // Connecting state is unstable, make it disappeared if unexpected

            if (mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTING) {