Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename NetworkSelectionStatus#getNetworkDisableReasonString am: e4956075da am: 279ce021c3 am: 0c2510643f

Browse Source 
Change-Id: I201e79656ba1e9cb0f40fdeb683decb12c88f4da
This commit is contained in:
Automerger Merge Worker
2020-02-27 00:15:27 +00:00
parent 8526864b73 0c2510643f
commit 9d21c2d0a9
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -7317,8 +7317,8 @@ package android.net.wifi {
method @Deprecated public int getDisableReasonCounter(int);
method @Deprecated public long getDisableTime();
method @Deprecated public static int getMaxNetworkSelectionDisableReason();
method @Deprecated @Nullable public static String getNetworkDisableReasonString(int);
method @Deprecated public int getNetworkSelectionDisableReason();
method @Deprecated @Nullable public static String getNetworkSelectionDisableReasonString(int);
method @Deprecated public int getNetworkSelectionStatus();
method @Deprecated @NonNull public String getNetworkStatusString();
method @Deprecated public boolean hasEverConnected();

20
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -1713,7 +1713,7 @@ public class WifiConfiguration implements Parcelable {
* @return network disable reason string, or null if the reason is invalid.
*/
@Nullable
public static String getNetworkDisableReasonString(
public static String getNetworkSelectionDisableReasonString(
@NetworkSelectionDisableReason int reason) {
DisableReasonInfo info = DISABLE_REASON_INFOS.get(reason);
if (info == null) {
@@ -1727,8 +1727,8 @@ public class WifiConfiguration implements Parcelable {
* @return current network disable reason in String (for debug purpose)
* @hide
*/
public String getNetworkDisableReasonString() {
return getNetworkDisableReasonString(mNetworkSelectionDisableReason);
public String getNetworkSelectionDisableReasonString() {
return getNetworkSelectionDisableReasonString(mNetworkSelectionDisableReason);
}
/**
@@ -2189,17 +2189,21 @@ public class WifiConfiguration implements Parcelable {
sbuf.append(" NetworkSelectionStatus ")
.append(mNetworkSelectionStatus.getNetworkStatusString() + "\n");
.append(mNetworkSelectionStatus.getNetworkStatusString())
.append("\n");
if (mNetworkSelectionStatus.getNetworkSelectionDisableReason() > 0) {
sbuf.append(" mNetworkSelectionDisableReason ")
.append(mNetworkSelectionStatus.getNetworkDisableReasonString() + "\n");
.append(mNetworkSelectionStatus.getNetworkSelectionDisableReasonString())
.append("\n");
for (int index = NetworkSelectionStatus.DISABLED_NONE;
index < NetworkSelectionStatus.NETWORK_SELECTION_DISABLED_MAX; index++) {
if (mNetworkSelectionStatus.getDisableReasonCounter(index) != 0) {
sbuf.append(NetworkSelectionStatus.getNetworkDisableReasonString(index)
+ " counter:" + mNetworkSelectionStatus.getDisableReasonCounter(index)
+ "\n");
sbuf.append(
NetworkSelectionStatus.getNetworkSelectionDisableReasonString(index))
.append(" counter:")
.append(mNetworkSelectionStatus.getDisableReasonCounter(index))
.append("\n");
}
}
}