diff options
author | Vinit Deshapnde <vinitd@google.com> | 2013-09-05 17:50:19 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 17:50:19 +0000 |
commit | b402fb2fddbee48ef3b518358dc5c86db63f7780 (patch) | |
tree | 1a274d79fac2ab0ed333d0022d316f316eff5771 /wifi | |
parent | a9fa33b366e82f330ec8a68b616896876e7ddc46 (diff) | |
parent | 6a2d32597a3f158f4ff5b07ad61c7d892d08f3bf (diff) | |
download | frameworks_base-b402fb2fddbee48ef3b518358dc5c86db63f7780.zip frameworks_base-b402fb2fddbee48ef3b518358dc5c86db63f7780.tar.gz frameworks_base-b402fb2fddbee48ef3b518358dc5c86db63f7780.tar.bz2 |
Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev
Diffstat (limited to 'wifi')
-rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index 62630d6..615c893 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -22,12 +22,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.BaseNetworkStateTracker; import android.net.LinkCapabilities; -import android.net.LinkInfo; +import android.net.LinkQualityInfo; import android.net.LinkProperties; import android.net.NetworkInfo; import android.net.NetworkInfo.DetailedState; import android.net.SamplingDataTracker; -import android.net.WifiLinkInfo; +import android.net.WifiLinkQualityInfo; import android.os.Handler; import android.os.Message; import android.os.Messenger; @@ -203,35 +203,35 @@ public class WifiStateTracker extends BaseNetworkStateTracker { /** * Return link info - * @return an object of type WifiLinkInfo + * @return an object of type WifiLinkQualityInfo */ @Override - public LinkInfo getLinkInfo() { + public LinkQualityInfo getLinkQualityInfo() { if (mNetworkInfo == null) { // no data available yet; just return return null; } - WifiLinkInfo li = new WifiLinkInfo(); - li.mNetworkType = mNetworkInfo.getType(); + WifiLinkQualityInfo li = new WifiLinkQualityInfo(); + li.setNetworkType(mNetworkInfo.getType()); synchronized(mSamplingDataTracker.mSamplingDataLock) { - mSamplingDataTracker.setCommonLinkInfoFields(li); - li.mTxGood = mSamplingDataTracker.getSampledTxPacketCount(); - li.mTxBad = mSamplingDataTracker.getSampledTxPacketErrorCount(); + mSamplingDataTracker.setCommonLinkQualityInfoFields(li); + li.setTxGood(mSamplingDataTracker.getSampledTxPacketCount()); + li.setTxBad(mSamplingDataTracker.getSampledTxPacketErrorCount()); } // li.setTheoreticalRxBandwidth(??); // li.setTheoreticalTxBandwidth(??); if (mWifiInfo != null) { - li.mBssid = mWifiInfo.getBSSID(); + li.setBssid(mWifiInfo.getBSSID()); int rssi = mWifiInfo.getRssi(); - li.mRssi = rssi; + li.setRssi(rssi); - li.mNormalizedSignalStrength = mWifiManager.calculateSignalLevel(rssi, - LinkInfo.NORMALIZED_SIGNAL_STRENGTH_RANGE); + li.setNormalizedSignalStrength(mWifiManager.calculateSignalLevel(rssi, + LinkQualityInfo.NORMALIZED_SIGNAL_STRENGTH_RANGE)); } return li; |