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

Commit b21815e3 authored by Stephen Chen's avatar Stephen Chen
Browse files

Add subtypes to tron logging for Wifi toggles. 

For ACTION_WIFI_CONNECT, added subtype to specify whether user is
connecting to saved network.
For ACTION_WIFI_OFF, added subtype to specify whether user was connected
to a network at the time.

Bug: 32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
Merged-In: I1d4445bda2fbeb062831e6f858ccc711bff65105

Change-Id: I6b87dc10fcfe412f1c72ae944c2dd4d81da12b53
parent ce01f167

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

+7 −2
Original line number Diff line number Diff line
@@ -226,8 +226,13 @@ public class WifiEnabler implements SwitchBar.OnSwitchChangeListener { 
        if (mayDisableTethering(isChecked)) {

            mWifiManager.setWifiApEnabled(null, false);

        }

        MetricsLogger.action(mContext,

                isChecked ? MetricsEvent.ACTION_WIFI_ON : MetricsEvent.ACTION_WIFI_OFF);

        if (isChecked) {

            MetricsLogger.action(mContext, MetricsEvent.ACTION_WIFI_ON);

        } else {

            // Log if user was connected at the time of switching off.

            MetricsLogger.action(mContext, MetricsEvent.ACTION_WIFI_OFF,

                    mConnected.get());

        }

        if (!mWifiManager.setWifiEnabled(isChecked)) {

            // Error

            mSwitchBar.setEnabled(true);

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

+15 −10
Original line number Diff line number Diff line
@@ -481,12 +481,13 @@ public class WifiSettings extends RestrictedSettingsFragment 
        }

        switch (item.getItemId()) {

            case MENU_ID_CONNECT: {

                if (mSelectedAccessPoint.isSaved()) {

                    connect(mSelectedAccessPoint.getConfig());

                boolean isSavedNetwork = mSelectedAccessPoint.isSaved();

                if (isSavedNetwork) {

                    connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);

                } else if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) {

                    /** Bypass dialog for unsecured networks */

                    mSelectedAccessPoint.generateOpenNetworkConfig();

                    connect(mSelectedAccessPoint.getConfig());

                    connect(mSelectedAccessPoint.getConfig(), isSavedNetwork);

                } else {

                    showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);

                }
@@ -519,7 +520,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
            if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE &&

                    !mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {

                mSelectedAccessPoint.generateOpenNetworkConfig();

                connect(mSelectedAccessPoint.getConfig());

                connect(mSelectedAccessPoint.getConfig(), false /* isSavedNetwork */);

            } else if (mSelectedAccessPoint.isSaved()) {

                showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_VIEW);

            } else {
@@ -813,14 +814,14 @@ public class WifiSettings extends RestrictedSettingsFragment 
        if (config == null) {

            if (mSelectedAccessPoint != null

                    && mSelectedAccessPoint.isSaved()) {

                connect(mSelectedAccessPoint.getConfig());

                connect(mSelectedAccessPoint.getConfig(), true /* isSavedNetwork */);

            }

        } else if (configController.getMode() == WifiConfigUiBase.MODE_MODIFY) {

            mWifiManager.save(config, mSaveListener);

        } else {

            mWifiManager.save(config, mSaveListener);

            if (mSelectedAccessPoint != null) { // Not an "Add network"

                connect(config);

                connect(config, false /* isSavedNetwork */);

            }

        }
@@ -850,13 +851,17 @@ public class WifiSettings extends RestrictedSettingsFragment 
        changeNextButtonState(false);

    }



    protected void connect(final WifiConfiguration config) {

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

    protected void connect(final WifiConfiguration config, boolean isSavedNetwork) {

        // Log subtype if configuration is a saved network.

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

                isSavedNetwork);

        mWifiManager.connect(config, mConnectListener);

    }



    protected void connect(final int networkId) {

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

    protected void connect(final int networkId, boolean isSavedNetwork) {

        // Log subtype if configuration is a saved network.

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

                isSavedNetwork);

        mWifiManager.connect(networkId, mConnectListener);

    }

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

+4 −4
Original line number Diff line number Diff line
@@ -130,17 +130,17 @@ public class WifiSettingsForSetupWizard extends WifiSettings { 
    }



    @Override

    protected void connect(final WifiConfiguration config) {

    protected void connect(final WifiConfiguration config, boolean isSavedNetwork) {

        WifiSetupActivity activity = (WifiSetupActivity) getActivity();

        activity.networkSelected();

        super.connect(config);

        super.connect(config, isSavedNetwork);

    }



    @Override

    protected void connect(final int networkId) {

    protected void connect(final int networkId, boolean isSavedNetwork) {

        WifiSetupActivity activity = (WifiSetupActivity) getActivity();

        activity.networkSelected();

        super.connect(networkId);

        super.connect(networkId, isSavedNetwork);

    }



    @Override