From 25e64398465aa689a2d8cbcf2e9490b579775e4a Mon Sep 17 00:00:00 2001 From: David Su Date: Thu, 23 Jan 2020 18:21:08 -0800 Subject: [PATCH] WifiInfo: Rename getters Renamed getters to make their meaning clearer. Bug: 145745815 Test: compiles Change-Id: Ia0dc4216a7f38e5d475b6e44dd55bf46c812d2f6 --- api/system-current.txt | 11 ++- .../android/settingslib/wifi/AccessPoint.java | 2 +- .../android/settingslib/wifi/WifiUtils.java | 8 +- .../settingslib/wifi/AccessPointTest.java | 2 +- wifi/java/android/net/wifi/WifiInfo.java | 92 +++++++++---------- .../src/android/net/wifi/WifiInfoTest.java | 4 +- 6 files changed, 60 insertions(+), 59 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index a2f363f0d9470..85090faabd208 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7524,12 +7524,12 @@ package android.net.wifi { } public class WifiInfo implements android.os.Parcelable { - method @Nullable public String getAppPackageName(); - method public double getRxSuccessRate(); + method public double getLostTxPacketsPerSecond(); + method @Nullable public String getRequestingPackageName(); + method public double getRetriedTxPacketsPerSecond(); method public int getScore(); - method public double getTxBadRate(); - method public double getTxRetriesRate(); - method public double getTxSuccessRate(); + method public double getSuccessfulRxPacketsPerSecond(); + method public double getSuccessfulTxPacketsPerSecond(); method public boolean isEphemeral(); method public boolean isOsuAp(); method public boolean isPasspointAp(); @@ -14244,3 +14244,4 @@ package android.webkit { } } + diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 9d4c24e8faa4c..84dde05afb2e8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -1141,7 +1141,7 @@ public class AccessPoint implements Comparable { } else if (isActive()) { summary.append(getSummary(mContext, /* ssid */ null, getDetailedState(), mInfo != null && mInfo.isEphemeral(), - mInfo != null ? mInfo.getAppPackageName() : null)); + mInfo != null ? mInfo.getRequestingPackageName() : null)); } else { // not active if (mConfig != null && mConfig.hasNoInternetAccess()) { int messageID = mConfig.getNetworkSelectionStatus().isNetworkPermanentlyDisabled() diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java index b93b0001f5dec..78ccba02fb042 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiUtils.java @@ -102,10 +102,10 @@ public class WifiUtils { if (accessPoint.getSpeed() != AccessPoint.Speed.NONE) { visibility.append(" speed=").append(accessPoint.getSpeedLabel()); } - visibility.append(String.format(" tx=%.1f,", info.getTxSuccessRate())); - visibility.append(String.format("%.1f,", info.getTxRetriesRate())); - visibility.append(String.format("%.1f ", info.getTxBadRate())); - visibility.append(String.format("rx=%.1f", info.getRxSuccessRate())); + visibility.append(String.format(" tx=%.1f,", info.getSuccessfulTxPacketsPerSecond())); + visibility.append(String.format("%.1f,", info.getRetriedTxPacketsPerSecond())); + visibility.append(String.format("%.1f ", info.getLostTxPacketsPerSecond())); + visibility.append(String.format("rx=%.1f", info.getSuccessfulRxPacketsPerSecond())); } int maxRssi5 = INVALID_RSSI; diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java index 03201ae6d5ba1..42f3cbb04cf80 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java @@ -507,7 +507,7 @@ public class AccessPointTest { WifiInfo wifiInfo = new WifiInfo(); wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_SSID)); wifiInfo.setEphemeral(true); - wifiInfo.setAppPackageName(appPackageName); + wifiInfo.setRequestingPackageName(appPackageName); wifiInfo.setRssi(rssi); Context context = mock(Context.class); diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 419bcb1070131..f8d48c5403f7a 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -178,7 +178,7 @@ public class WifiInfo implements Parcelable { * If connected to a network suggestion or specifier, store the package name of the app, * else null. */ - private String mAppPackageName; + private String mRequestingPackageName; /** * Running total count of lost (not ACKed) transmitted unicast data packets. @@ -201,68 +201,68 @@ public class WifiInfo implements Parcelable { */ public long rxSuccess; - private double mTxBadRate; + private double mLostTxPacketsPerSecond; /** * Average rate of lost transmitted packets, in units of packets per second. * @hide */ @SystemApi - public double getTxBadRate() { - return mTxBadRate; + public double getLostTxPacketsPerSecond() { + return mLostTxPacketsPerSecond; } /** @hide */ - public void setTxBadRate(double txBadRate) { - mTxBadRate = txBadRate; + public void setLostTxPacketsPerSecond(double lostTxPacketsPerSecond) { + mLostTxPacketsPerSecond = lostTxPacketsPerSecond; } - private double mTxRetriesRate; + private double mTxRetriedTxPacketsPerSecond; /** * Average rate of transmitted retry packets, in units of packets per second. * @hide */ @SystemApi - public double getTxRetriesRate() { - return mTxRetriesRate; + public double getRetriedTxPacketsPerSecond() { + return mTxRetriedTxPacketsPerSecond; } /** @hide */ - public void setTxRetriesRate(double txRetriesRate) { - mTxRetriesRate = txRetriesRate; + public void setRetriedTxPacketsRate(double txRetriedTxPacketsPerSecond) { + mTxRetriedTxPacketsPerSecond = txRetriedTxPacketsPerSecond; } - private double mTxSuccessRate; + private double mSuccessfulTxPacketsPerSecond; /** * Average rate of successfully transmitted unicast packets, in units of packets per second. * @hide */ @SystemApi - public double getTxSuccessRate() { - return mTxSuccessRate; + public double getSuccessfulTxPacketsPerSecond() { + return mSuccessfulTxPacketsPerSecond; } /** @hide */ - public void setTxSuccessRate(double txSuccessRate) { - mTxSuccessRate = txSuccessRate; + public void setSuccessfulTxPacketsPerSecond(double successfulTxPacketsPerSecond) { + mSuccessfulTxPacketsPerSecond = successfulTxPacketsPerSecond; } - private double mRxSuccessRate; + private double mSuccessfulRxPacketsPerSecond; /** * Average rate of received unicast data packets, in units of packets per second. * @hide */ @SystemApi - public double getRxSuccessRate() { - return mRxSuccessRate; + public double getSuccessfulRxPacketsPerSecond() { + return mSuccessfulRxPacketsPerSecond; } /** @hide */ - public void setRxSuccessRate(double rxSuccessRate) { - mRxSuccessRate = rxSuccessRate; + public void setSuccessfulRxPacketsPerSecond(double successfulRxPacketsPerSecond) { + mSuccessfulRxPacketsPerSecond = successfulRxPacketsPerSecond; } /** @hide */ @@ -319,17 +319,17 @@ public class WifiInfo implements Parcelable { setMeteredHint(false); setEphemeral(false); setOsuAp(false); - setAppPackageName(null); + setRequestingPackageName(null); setFQDN(null); setProviderFriendlyName(null); txBad = 0; txSuccess = 0; rxSuccess = 0; txRetries = 0; - mTxBadRate = 0; - mTxSuccessRate = 0; - mRxSuccessRate = 0; - mTxRetriesRate = 0; + mLostTxPacketsPerSecond = 0; + mSuccessfulTxPacketsPerSecond = 0; + mSuccessfulRxPacketsPerSecond = 0; + mTxRetriedTxPacketsPerSecond = 0; score = 0; } @@ -353,8 +353,8 @@ public class WifiInfo implements Parcelable { mMeteredHint = source.mMeteredHint; mEphemeral = source.mEphemeral; mTrusted = source.mTrusted; - mAppPackageName = - source.mAppPackageName; + mRequestingPackageName = + source.mRequestingPackageName; mOsuAp = source.mOsuAp; mFqdn = source.mFqdn; mProviderFriendlyName = source.mProviderFriendlyName; @@ -362,10 +362,10 @@ public class WifiInfo implements Parcelable { txRetries = source.txRetries; txSuccess = source.txSuccess; rxSuccess = source.rxSuccess; - mTxBadRate = source.mTxBadRate; - mTxRetriesRate = source.mTxRetriesRate; - mTxSuccessRate = source.mTxSuccessRate; - mRxSuccessRate = source.mRxSuccessRate; + mLostTxPacketsPerSecond = source.mLostTxPacketsPerSecond; + mTxRetriedTxPacketsPerSecond = source.mTxRetriedTxPacketsPerSecond; + mSuccessfulTxPacketsPerSecond = source.mSuccessfulTxPacketsPerSecond; + mSuccessfulRxPacketsPerSecond = source.mSuccessfulRxPacketsPerSecond; score = source.score; mWifiStandard = source.mWifiStandard; mMaxSupportedTxLinkSpeed = source.mMaxSupportedTxLinkSpeed; @@ -777,8 +777,8 @@ public class WifiInfo implements Parcelable { } /** {@hide} */ - public void setAppPackageName(@Nullable String packageName) { - mAppPackageName = packageName; + public void setRequestingPackageName(@Nullable String packageName) { + mRequestingPackageName = packageName; } /** @@ -788,8 +788,8 @@ public class WifiInfo implements Parcelable { * @hide */ @SystemApi - public @Nullable String getAppPackageName() { - return mAppPackageName; + public @Nullable String getRequestingPackageName() { + return mRequestingPackageName; } @@ -956,16 +956,16 @@ public class WifiInfo implements Parcelable { dest.writeInt(mTrusted ? 1 : 0); dest.writeInt(score); dest.writeLong(txSuccess); - dest.writeDouble(mTxSuccessRate); + dest.writeDouble(mSuccessfulTxPacketsPerSecond); dest.writeLong(txRetries); - dest.writeDouble(mTxRetriesRate); + dest.writeDouble(mTxRetriedTxPacketsPerSecond); dest.writeLong(txBad); - dest.writeDouble(mTxBadRate); + dest.writeDouble(mLostTxPacketsPerSecond); dest.writeLong(rxSuccess); - dest.writeDouble(mRxSuccessRate); + dest.writeDouble(mSuccessfulRxPacketsPerSecond); mSupplicantState.writeToParcel(dest, flags); dest.writeInt(mOsuAp ? 1 : 0); - dest.writeString(mAppPackageName); + dest.writeString(mRequestingPackageName); dest.writeString(mFqdn); dest.writeString(mProviderFriendlyName); dest.writeInt(mWifiStandard); @@ -1000,16 +1000,16 @@ public class WifiInfo implements Parcelable { info.mTrusted = in.readInt() != 0; info.score = in.readInt(); info.txSuccess = in.readLong(); - info.mTxSuccessRate = in.readDouble(); + info.mSuccessfulTxPacketsPerSecond = in.readDouble(); info.txRetries = in.readLong(); - info.mTxRetriesRate = in.readDouble(); + info.mTxRetriedTxPacketsPerSecond = in.readDouble(); info.txBad = in.readLong(); - info.mTxBadRate = in.readDouble(); + info.mLostTxPacketsPerSecond = in.readDouble(); info.rxSuccess = in.readLong(); - info.mRxSuccessRate = in.readDouble(); + info.mSuccessfulRxPacketsPerSecond = in.readDouble(); info.mSupplicantState = SupplicantState.CREATOR.createFromParcel(in); info.mOsuAp = in.readInt() != 0; - info.mAppPackageName = in.readString(); + info.mRequestingPackageName = in.readString(); info.mFqdn = in.readString(); info.mProviderFriendlyName = in.readString(); info.mWifiStandard = in.readInt(); diff --git a/wifi/tests/src/android/net/wifi/WifiInfoTest.java b/wifi/tests/src/android/net/wifi/WifiInfoTest.java index 04759ac21bba2..311bbc41b8fec 100644 --- a/wifi/tests/src/android/net/wifi/WifiInfoTest.java +++ b/wifi/tests/src/android/net/wifi/WifiInfoTest.java @@ -64,7 +64,7 @@ public class WifiInfoTest { writeWifiInfo.setOsuAp(true); writeWifiInfo.setFQDN(TEST_FQDN); writeWifiInfo.setProviderFriendlyName(TEST_PROVIDER_NAME); - writeWifiInfo.setAppPackageName(TEST_PACKAGE_NAME); + writeWifiInfo.setRequestingPackageName(TEST_PACKAGE_NAME); writeWifiInfo.setWifiStandard(TEST_WIFI_STANDARD); writeWifiInfo.setMaxSupportedTxLinkSpeedMbps(TEST_MAX_SUPPORTED_TX_LINK_SPEED_MBPS); writeWifiInfo.setMaxSupportedRxLinkSpeedMbps(TEST_MAX_SUPPORTED_RX_LINK_SPEED_MBPS); @@ -83,7 +83,7 @@ public class WifiInfoTest { assertTrue(readWifiInfo.isTrusted()); assertTrue(readWifiInfo.isOsuAp()); assertTrue(readWifiInfo.isPasspointAp()); - assertEquals(TEST_PACKAGE_NAME, readWifiInfo.getAppPackageName()); + assertEquals(TEST_PACKAGE_NAME, readWifiInfo.getRequestingPackageName()); assertEquals(TEST_FQDN, readWifiInfo.getPasspointFqdn()); assertEquals(TEST_PROVIDER_NAME, readWifiInfo.getPasspointProviderFriendlyName()); assertEquals(TEST_WIFI_STANDARD, readWifiInfo.getWifiStandard());