diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/java/com/android/internal/telephony/dataconnection/DataConnection.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java index 0919af1d8..834548b52 100644 --- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java +++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java @@ -409,6 +409,9 @@ public class DataConnection extends StateMachine { networkType, NETWORK_TYPE, TelephonyManager.getNetworkTypeName(networkType)); mNetworkInfo.setRoaming(ss.getDataRoaming()); mNetworkInfo.setIsAvailable(true); + // The network should be by default metered until we find it has NET_CAPABILITY_NOT_METERED + // capability. + mNetworkInfo.setMetered(true); addState(mDefaultState); addState(mInactiveState, mDefaultState); @@ -947,6 +950,10 @@ public class DataConnection extends StateMachine { if (!mApnSetting.isMetered(mPhone.getContext(), mPhone.getSubId(), mPhone.getServiceState().getDataRoaming())) { result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); + mNetworkInfo.setMetered(false); + } else { + result.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); + mNetworkInfo.setMetered(true); } result.maybeMarkCapabilitiesRestricted(); |