diff options
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 7 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiInfo.java | 16 |
2 files changed, 20 insertions, 3 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 0180a30..9325246 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -387,7 +387,7 @@ public class AccessPoint implements Comparable<AccessPoint> { } else if (isActive()) { // This is the active connection on non-passpoint network summary.append(getSummary(mContext, getDetailedState(), - networkId == WifiConfiguration.INVALID_NETWORK_ID)); + mInfo != null && mInfo.isEphemeral())); } else if (mConfig != null && mConfig.isPasspoint()) { String format = mContext.getString(R.string.available_via_passpoint); summary.append(String.format(format, mConfig.providerFriendlyName)); @@ -620,7 +620,8 @@ public class AccessPoint implements Comparable<AccessPoint> { } public boolean isEphemeral() { - return !isSaved() && mNetworkInfo != null && mNetworkInfo.getState() != State.DISCONNECTED; + return mInfo != null && mInfo.isEphemeral() && + mNetworkInfo != null && mNetworkInfo.getState() != State.DISCONNECTED; } /** Return whether the given {@link WifiInfo} is for this access point. */ @@ -757,7 +758,7 @@ public class AccessPoint implements Comparable<AccessPoint> { mAccessPointListener.onAccessPointChanged(this); } } - + public static String getSummary(Context context, String ssid, DetailedState state, boolean isEphemeral, String passpointProvider) { if (state == DetailedState.CONNECTED && ssid == null) { diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 2ba38e1..e25b38c 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -101,6 +101,8 @@ public class WifiInfo implements Parcelable { private InetAddress mIpAddress; private String mMacAddress = DEFAULT_MAC_ADDRESS; + private boolean mEphemeral; + /** * @hide */ @@ -253,6 +255,7 @@ public class WifiInfo implements Parcelable { setLinkSpeed(-1); setFrequency(-1); setMeteredHint(false); + setEphemeral(false); txBad = 0; txSuccess = 0; rxSuccess = 0; @@ -283,6 +286,7 @@ public class WifiInfo implements Parcelable { mIpAddress = source.mIpAddress; mMacAddress = source.mMacAddress; mMeteredHint = source.mMeteredHint; + mEphemeral = source.mEphemeral; txBad = source.txBad; txRetries = source.txRetries; txSuccess = source.txSuccess; @@ -430,6 +434,16 @@ public class WifiInfo implements Parcelable { return mMeteredHint; } + /** {@hide} */ + public void setEphemeral(boolean ephemeral) { + mEphemeral = ephemeral; + } + + /** {@hide} */ + public boolean isEphemeral() { + return mEphemeral; + } + /** @hide */ public void setNetworkId(int id) { mNetworkId = id; @@ -567,6 +581,7 @@ public class WifiInfo implements Parcelable { dest.writeString(mBSSID); dest.writeString(mMacAddress); dest.writeInt(mMeteredHint ? 1 : 0); + dest.writeInt(mEphemeral ? 1 : 0); dest.writeInt(score); dest.writeDouble(txSuccessRate); dest.writeDouble(txRetriesRate); @@ -597,6 +612,7 @@ public class WifiInfo implements Parcelable { info.mBSSID = in.readString(); info.mMacAddress = in.readString(); info.mMeteredHint = in.readInt() != 0; + info.mEphemeral = in.readInt() != 0; info.score = in.readInt(); info.txSuccessRate = in.readDouble(); info.txRetriesRate = in.readDouble(); |