diff options
| author | David Su <dysu@google.com> | 2020-02-25 14:27:09 -0800 |
|---|---|---|
| committer | David Su <dysu@google.com> | 2020-02-25 14:27:48 -0800 |
| commit | c1b2d4aca31ef619f1e79784b45bbb54bcc0ae1a (patch) | |
| tree | 9ec081f0aad405ad096898363b1654c46596262f /service | |
| parent | b66edf6a39b0038c885b98134679d491ddfffd84 (diff) | |
Rename NetworkSelectionStatus#getNetworkDisableReasonString
Renamed to getNetworkSelectionDisableReasonString
to be more descriptive.
Bug: 146046526
Test: compiles
Change-Id: I8b8f9984a15da8978913c780c0e957478b7caeac
Diffstat (limited to 'service')
3 files changed, 8 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index adcfae5e5..2c0887982 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -1571,7 +1571,7 @@ public class WifiConfigManager { != NetworkSelectionStatus.NETWORK_SELECTION_ENABLED) { localLog("setNetworkSelectionEnabled: configKey=" + config.getKey() + " old networkStatus=" + status.getNetworkStatusString() - + " disableReason=" + status.getNetworkDisableReasonString()); + + " disableReason=" + status.getNetworkSelectionDisableReasonString()); } status.setNetworkSelectionStatus( NetworkSelectionStatus.NETWORK_SELECTION_ENABLED); @@ -1659,7 +1659,7 @@ public class WifiConfigManager { } localLog("setNetworkSelectionStatus: configKey=" + config.getKey() + " networkStatus=" + networkStatus.getNetworkStatusString() + " disableReason=" - + networkStatus.getNetworkDisableReasonString()); + + networkStatus.getNetworkSelectionDisableReasonString()); saveToStore(false); return true; } @@ -1700,9 +1700,9 @@ public class WifiConfigManager { if (mVerboseLoggingEnabled) { Log.v(TAG, "Disable counter for network " + config.getPrintableSsid() + " for reason " - + NetworkSelectionStatus.getNetworkDisableReasonString(reason) + " is " - + networkStatus.getDisableReasonCounter(reason) + " and threshold is " - + disableReasonThreshold); + + NetworkSelectionStatus.getNetworkSelectionDisableReasonString(reason) + + " is " + networkStatus.getDisableReasonCounter(reason) + + " and threshold is " + disableReasonThreshold); } return true; } diff --git a/service/java/com/android/server/wifi/WifiNetworkSelector.java b/service/java/com/android/server/wifi/WifiNetworkSelector.java index 59bc6dce8..dc8ac7843 100644 --- a/service/java/com/android/server/wifi/WifiNetworkSelector.java +++ b/service/java/com/android/server/wifi/WifiNetworkSelector.java @@ -609,7 +609,7 @@ public class WifiNetworkSelector { if (count > 0) { sbuf.append("reason=") .append(WifiConfiguration.NetworkSelectionStatus - .getNetworkDisableReasonString(index)) + .getNetworkSelectionDisableReasonString(index)) .append(", count=").append(count).append("; "); } } diff --git a/service/java/com/android/server/wifi/util/XmlUtil.java b/service/java/com/android/server/wifi/util/XmlUtil.java index 06f8c4967..7c32634c0 100644 --- a/service/java/com/android/server/wifi/util/XmlUtil.java +++ b/service/java/com/android/server/wifi/util/XmlUtil.java @@ -1012,7 +1012,8 @@ public class XmlUtil { XmlUtil.writeNextValue( out, XML_TAG_SELECTION_STATUS, selectionStatus.getNetworkStatusString()); XmlUtil.writeNextValue( - out, XML_TAG_DISABLE_REASON, selectionStatus.getNetworkDisableReasonString()); + out, XML_TAG_DISABLE_REASON, + selectionStatus.getNetworkSelectionDisableReasonString()); XmlUtil.writeNextValue(out, XML_TAG_CONNECT_CHOICE, selectionStatus.getConnectChoice()); XmlUtil.writeNextValue( out, XML_TAG_HAS_EVER_CONNECTED, selectionStatus.hasEverConnected()); |