} 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));
}
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. */
mAccessPointListener.onAccessPointChanged(this);
}
}
-
+
public static String getSummary(Context context, String ssid, DetailedState state,
boolean isEphemeral, String passpointProvider) {
if (state == DetailedState.CONNECTED && ssid == null) {
private InetAddress mIpAddress;
private String mMacAddress = DEFAULT_MAC_ADDRESS;
+ private boolean mEphemeral;
+
/**
* @hide
*/
setLinkSpeed(-1);
setFrequency(-1);
setMeteredHint(false);
+ setEphemeral(false);
txBad = 0;
txSuccess = 0;
rxSuccess = 0;
mIpAddress = source.mIpAddress;
mMacAddress = source.mMacAddress;
mMeteredHint = source.mMeteredHint;
+ mEphemeral = source.mEphemeral;
txBad = source.txBad;
txRetries = source.txRetries;
txSuccess = source.txSuccess;
return mMeteredHint;
}
+ /** {@hide} */
+ public void setEphemeral(boolean ephemeral) {
+ mEphemeral = ephemeral;
+ }
+
+ /** {@hide} */
+ public boolean isEphemeral() {
+ return mEphemeral;
+ }
+
/** @hide */
public void setNetworkId(int id) {
mNetworkId = id;
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);
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();