diff options
Diffstat (limited to 'services/QualifiedNetworksService/src/com/android')
3 files changed, 24 insertions, 22 deletions
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/AccessNetworkSelectionPolicyBuilder.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/AccessNetworkSelectionPolicyBuilder.java index cae0c07..7b32183 100644 --- a/services/QualifiedNetworksService/src/com/android/telephony/qns/AccessNetworkSelectionPolicyBuilder.java +++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/AccessNetworkSelectionPolicyBuilder.java @@ -53,7 +53,7 @@ class AccessNetworkSelectionPolicyBuilder { static final int GUARDING_CELL = QnsConstants.GUARDING_CELLULAR; static final int GUARDING_WIFI = QnsConstants.GUARDING_WIFI; - static HashMap<AnspKey, String[]> sPolicyMap; + static final HashMap<AnspKey, String[]> sPolicyMap; static { // Default policy map diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/AnspImsPreferModePolicyBuilder.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/AnspImsPreferModePolicyBuilder.java index fcfcd2d..01c3062 100644 --- a/services/QualifiedNetworksService/src/com/android/telephony/qns/AnspImsPreferModePolicyBuilder.java +++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/AnspImsPreferModePolicyBuilder.java @@ -23,6 +23,7 @@ import java.util.List; class AnspImsPreferModePolicyBuilder extends AccessNetworkSelectionPolicyBuilder { + static final HashMap<AnspKey, String[]> sImsPreferModePolicyMap; AnspImsPreferModePolicyBuilder( QnsCarrierConfigManager configManager, int netCapability) { super(configManager, netCapability); @@ -30,49 +31,49 @@ class AnspImsPreferModePolicyBuilder extends AccessNetworkSelectionPolicyBuilder } static { - sPolicyMap = new HashMap<>(); - sPolicyMap.put( + sImsPreferModePolicyMap = new HashMap<>(); + sImsPreferModePolicyMap.put( new AnspKey(ROVE_IN, IDLE, WIFI_PREF), new String[] {"Condition:WIFI_AVAILABLE"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_OUT, IDLE, WIFI_PREF), new String[] {"Condition:EUTRAN_TOLERABLE"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_IN, VOICE, WIFI_PREF), new String[] {"Condition:WIFI_GOOD"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_OUT, VOICE, WIFI_PREF), new String[] {"Condition:WIFI_BAD,EUTRAN_TOLERABLE"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_IN, VIDEO, WIFI_PREF), new String[] {"Condition:WIFI_GOOD"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_OUT, VIDEO, WIFI_PREF), new String[] {"Condition:WIFI_BAD,EUTRAN_TOLERABLE"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_IN, IDLE, CELL_PREF, ROAM), new String[] {"Condition:WIFI_GOOD,CELLULAR_BAD"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_OUT, IDLE, CELL_PREF, ROAM), new String[] {"Condition:CELLULAR_GOOD"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_IN, VOICE, CELL_PREF, ROAM), new String[] {"Condition:WIFI_GOOD,CELLULAR_BAD"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_OUT, VOICE, CELL_PREF, ROAM), new String[] {"Condition:WIFI_BAD,EUTRAN_TOLERABLE"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_IN, VIDEO, CELL_PREF, ROAM), new String[] {"Condition:WIFI_GOOD,CELLULAR_BAD"}); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_OUT, VIDEO, CELL_PREF, ROAM), new String[] {"Condition:WIFI_BAD,EUTRAN_TOLERABLE"}); // Overridden rules to ims preference from cellular preference - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_IN, IDLE, CELL_PREF, HOME), new String[] { "Condition:WIFI_GOOD,EUTRAN_BAD", "Condition:WIFI_GOOD,UTRAN_AVAILABLE", "Condition:WIFI_GOOD,GERAN_AVAILABLE" }); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_OUT, IDLE, CELL_PREF, HOME), new String[] { "Condition:EUTRAN_GOOD", @@ -80,14 +81,14 @@ class AnspImsPreferModePolicyBuilder extends AccessNetworkSelectionPolicyBuilder "Condition:WIFI_BAD,UTRAN_GOOD", "Condition:WIFI_BAD,GERAN_GOOD" }); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_IN, VOICE, CELL_PREF, HOME), new String[] { "Condition:WIFI_GOOD,EUTRAN_BAD", "Condition:WIFI_GOOD,UTRAN_AVAILABLE", "Condition:WIFI_GOOD,GERAN_AVAILABLE" }); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_OUT, VOICE, CELL_PREF, HOME), new String[] { "Condition:EUTRAN_GOOD", @@ -95,14 +96,14 @@ class AnspImsPreferModePolicyBuilder extends AccessNetworkSelectionPolicyBuilder "Condition:WIFI_BAD,UTRAN_GOOD", "Condition:WIFI_BAD,GERAN_GOOD" }); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_IN, VIDEO, CELL_PREF, HOME), new String[] { "Condition:WIFI_GOOD,EUTRAN_BAD", "Condition:WIFI_GOOD,UTRAN_AVAILABLE", "Condition:WIFI_GOOD,GERAN_AVAILABLE" }); - sPolicyMap.put( + sImsPreferModePolicyMap.put( new AnspKey(ROVE_OUT, VIDEO, CELL_PREF, HOME), new String[] { "Condition:EUTRAN_GOOD", @@ -117,11 +118,11 @@ class AnspImsPreferModePolicyBuilder extends AccessNetworkSelectionPolicyBuilder @QnsConstants.RoveDirection int direction, AccessNetworkSelectionPolicy.PreCondition preCondition) { if (preCondition.getPreference() == WIFI_PREF) { - return sPolicyMap.get( + return sImsPreferModePolicyMap.get( new AnspKey( direction, preCondition.getCallType(), preCondition.getPreference())); } - return sPolicyMap.get( + return sImsPreferModePolicyMap.get( new AnspKey( direction, preCondition.getCallType(), diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/RestrictManager.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/RestrictManager.java index 789f6f6..64c3aa7 100644 --- a/services/QualifiedNetworksService/src/com/android/telephony/qns/RestrictManager.java +++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/RestrictManager.java @@ -751,6 +751,7 @@ class RestrictManager { clearInitialPdnConnectionFailFallbackRestriction(); checkIfCancelNonPreferredRestriction(QnsUtils.getOtherTransportType(transportType)); + releaseRestriction(transportType, RESTRICT_TYPE_THROTTLING, true); if (mNetCapability == NetworkCapabilities.NET_CAPABILITY_IMS) { if (mLastEvaluatedTransportType == AccessNetworkConstants.TRANSPORT_TYPE_INVALID || transportType == mLastEvaluatedTransportType) { |