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

Commit f22e8c4c authored by Chris Wren's avatar Chris Wren
Browse files

log wifi actions from settings 

To start:
  enable
  disable
  forget
  connect
  add

Depends-On: I60163e44602b8e23b643b9103c324fa0e0d2c4c4
Change-Id: I52f40298db63f410ced2dbf5ba05d3ad098a85a2
parent ec5a3373

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

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.provider.Settings; 
import android.widget.Switch;

import android.widget.Toast;



import com.android.internal.logging.MetricsLogger;

import com.android.settings.R;

import com.android.settings.search.Index;

import com.android.settings.widget.SwitchBar;
@@ -209,7 +210,8 @@ public class WifiEnabler implements SwitchBar.OnSwitchChangeListener { 
                (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) {

            mWifiManager.setWifiApEnabled(null, false);

        }



        MetricsLogger.action(mContext,

                isChecked ? MetricsLogger.ACTION_WIFI_ON : MetricsLogger.ACTION_WIFI_OFF);

        if (!mWifiManager.setWifiEnabled(isChecked)) {

            // Error

            mSwitchBar.setEnabled(true);

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

+5 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
                showDialog(WPS_PIN_DIALOG_ID);

                return true;

            case MENU_ID_SCAN:

                MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORCE_SCAN);

                mWifiTracker.forceScan();

                return true;

            case MENU_ID_ADD_NETWORK:
@@ -707,6 +708,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
    }



    /* package */ void forget() {

        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_FORGET);

        if (!mSelectedAccessPoint.isSaved()) {

            if (mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {

                // Network is active but has no network ID - must be ephemeral.
@@ -728,10 +730,12 @@ public class WifiSettings extends RestrictedSettingsFragment 
    }



    protected void connect(final WifiConfiguration config) {

        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);

        mWifiManager.connect(config, mConnectListener);

    }



    protected void connect(final int networkId) {

        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_CONNECT);

        mWifiManager.connect(networkId, mConnectListener);

    }
@@ -748,6 +752,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
     * Called when "add network" button is pressed.

     */

    /* package */ void onAddNetworkPressed() {

        MetricsLogger.action(getActivity(), MetricsLogger.ACTION_WIFI_ADD_NETWORK);

        // No exact access point is selected.

        mSelectedAccessPoint = null;

        showDialog(null, true);