diff options
Diffstat (limited to 'services/QualifiedNetworksService/src/com/android')
4 files changed, 33 insertions, 30 deletions
diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierAnspSupportConfig.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierAnspSupportConfig.java index f4545cc..d798d8e 100644 --- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierAnspSupportConfig.java +++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierAnspSupportConfig.java @@ -655,8 +655,8 @@ class QnsCarrierAnspSupportConfig { * <p>{@code 2 values defined by default(Good, Bad)} * * <UL> - * <LI>"Good:{@link QnsConstants#KEY_DEFAULT_THRESHOLD_VIDEO_WIFI_RSSI_GOOD}" - * <LI>"Bad:{@link QnsConstants#KEY_DEFAULT_THRESHOLD_VIDEO_WIFI_RSSI_BAD}" + * <LI>"Good:{@link QnsConstants#KEY_DEFAULT_THRESHOLD_WIFI_RSSI_GOOD}" + * <LI>"Bad:{@link QnsConstants#KEY_DEFAULT_THRESHOLD_WIFI_RSSI_BAD}" * </UL> * * <p>This key is considered invalid if the format is violated. If the key not configured, a @@ -716,8 +716,8 @@ class QnsCarrierAnspSupportConfig { * <p>{@code 2 values defined by default(Good, Bad)} * * <UL> - * <LI>"Good:{@link QnsConstants#KEY_DEFAULT_THRESHOLD_VIDEO_WIFI_RSSI_GOOD}" - * <LI>"Bad:{@link QnsConstants#KEY_DEFAULT_THRESHOLD_VIDEO_WIFI_RSSI_BAD}" + * <LI>"Good:{@link QnsConstants#KEY_DEFAULT_THRESHOLD_WIFI_RSSI_GOOD}" + * <LI>"Bad:{@link QnsConstants#KEY_DEFAULT_THRESHOLD_WIFI_RSSI_BAD}" * </UL> * * <p>This key is considered invalid if the format is violated. If the key not configured, a diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierConfigManager.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierConfigManager.java index 2b79227..ec6281a 100644 --- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierConfigManager.java +++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsCarrierConfigManager.java @@ -486,9 +486,16 @@ class QnsCarrierConfigManager { /** * This item is the minimum handover guarding timer value when there is no guarding time for * handover. + * Note: + * If this value is set to less than or equal to 0, minimum guarding action is disabled. + * if this value is set to greater than or equal to + * {@code QnsConstants#CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER_LIMIT}, + * {@code QnsConstants#CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER_LIMIT} value is set. + * If no value set at asset or paris , QnsConstants#CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER + * value at code is set. * * <p>{@code QnsConstants#CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER} : default value of timer. - * {@code QnsConstants#CONFIg_DEFAULT_MIN_HANDOVER_GUARDING_TIMER_LIMIT} : maximum allowable + * {@code QnsConstants#CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER_LIMIT} : maximum allowable * value. */ static final String KEY_MINIMUM_HANDOVER_GUARDING_TIMER_MS_INT = @@ -2040,10 +2047,10 @@ class QnsCarrierConfigManager { */ int getMinimumHandoverGuardingTimer() { int timer = mMinimumHandoverGuardingTimer; - if (timer < QnsConstants.CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER) { - timer = QnsConstants.CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER; + if (timer <= 0) { + return 0; } - if (timer > QnsConstants.CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER_LIMIT) { + if (timer >= QnsConstants.CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER_LIMIT) { timer = QnsConstants.CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER_LIMIT; } return timer; diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsConstants.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsConstants.java index 6db4a08..c60cf3e 100644 --- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsConstants.java +++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsConstants.java @@ -31,28 +31,26 @@ class QnsConstants { static final int INVALID_VALUE = -1; static final int INVALID_ID = -1; - static final int INVALID_SUB_ID = -1; static final int KEY_DEFAULT_VALUE = 0; static final int KEY_DEFAULT_HYST_TIMER = 30000; - static final int CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER = 0; + static final int CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER = 3000; static final int CONFIG_DEFAULT_MIN_HANDOVER_GUARDING_TIMER_LIMIT = 5000; static final int KEY_DEFAULT_PACKET_LOSS_TIME_MILLIS = 3000; static final int KEY_DEFAULT_IWLAN_AVOID_TIME_LOW_RTP_QUALITY_MILLIS = 60000; - - static final int KEY_DEFAULT_THRESHOLD_SSRSRP_GOOD = -99; - static final int KEY_DEFAULT_THRESHOLD_SSRSRP_BAD = -111; - static final int KEY_DEFAULT_THRESHOLD_RSRP_GOOD = -99; - static final int KEY_DEFAULT_THRESHOLD_RSRP_BAD = -111; - static final int KEY_DEFAULT_THRESHOLD_RSCP_GOOD = -90; - static final int KEY_DEFAULT_THRESHOLD_RSCP_BAD = -100; - static final int KEY_DEFAULT_THRESHOLD_GERAN_RSSI_GOOD = -90; - static final int KEY_DEFAULT_THRESHOLD_GERAN_RSSI_BAD = -100; - static final int KEY_DEFAULT_THRESHOLD_WIFI_RSSI_GOOD = -70; + static final int KEY_DEFAULT_WWAN_AVOID_TIME_LOW_RTP_QUALITY_MILLIS = 60000; + + static final int KEY_DEFAULT_THRESHOLD_SSRSRP_GOOD = -110; + static final int KEY_DEFAULT_THRESHOLD_SSRSRP_BAD = -115; + static final int KEY_DEFAULT_THRESHOLD_RSRP_GOOD = -115; + static final int KEY_DEFAULT_THRESHOLD_RSRP_BAD = -120; + static final int KEY_DEFAULT_THRESHOLD_RSCP_GOOD = -105; + static final int KEY_DEFAULT_THRESHOLD_RSCP_BAD = -115; + static final int KEY_DEFAULT_THRESHOLD_GERAN_RSSI_GOOD = -100; + static final int KEY_DEFAULT_THRESHOLD_GERAN_RSSI_BAD = -105; + static final int KEY_DEFAULT_THRESHOLD_WIFI_RSSI_GOOD = -75; static final int KEY_DEFAULT_THRESHOLD_WIFI_RSSI_BAD = -80; - static final int KEY_DEFAULT_THRESHOLD_VIDEO_WIFI_RSSI_GOOD = -65; - static final int KEY_DEFAULT_THRESHOLD_VIDEO_WIFI_RSSI_BAD = -75; static final int CALL_TYPE_IDLE = 0; static final int CALL_TYPE_VOICE = 1; @@ -184,7 +182,6 @@ class QnsConstants { static final int SIGNAL_AVAILABLE = 1; static final int DEFAULT_WIFI_BACKHAUL_TIMER = 3000; - static final int DEFAULT_MSG_DELAY_TIMER = 1000; static final int TRANSPORT_TYPE_ALLOWED_WWAN = 0; static final int TRANSPORT_TYPE_ALLOWED_IWLAN = 1; diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsUtils.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsUtils.java index b500ccf..c17a2c7 100644 --- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsUtils.java +++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsUtils.java @@ -662,7 +662,7 @@ class QnsUtils { return (T) new int[] { QnsConstants.KEY_DEFAULT_IWLAN_AVOID_TIME_LOW_RTP_QUALITY_MILLIS, - QnsConstants.KEY_DEFAULT_VALUE + QnsConstants.KEY_DEFAULT_WWAN_AVOID_TIME_LOW_RTP_QUALITY_MILLIS, }; case QnsCarrierConfigManager.KEY_IMS_WWAN_HYSTERESIS_TIMER_MS_INT_ARRAY: case QnsCarrierConfigManager.KEY_IMS_WLAN_HYSTERESIS_TIMER_MS_INT_ARRAY: @@ -681,6 +681,7 @@ class QnsUtils { return (T) new String[] {"LTE", "NR"}; case QnsCarrierAnspSupportConfig.KEY_IDLE_NGRAN_SSRSRP_INT_ARRAY: case QnsCarrierAnspSupportConfig.KEY_VOICE_NGRAN_SSRSRP_INT_ARRAY: + case QnsCarrierAnspSupportConfig.KEY_VIDEO_NGRAN_SSRSRP_INT_ARRAY: return (T) new int[] { QnsConstants.KEY_DEFAULT_THRESHOLD_SSRSRP_GOOD, @@ -689,6 +690,7 @@ class QnsUtils { }; case QnsCarrierAnspSupportConfig.KEY_IDLE_EUTRAN_RSRP_INT_ARRAY: case QnsCarrierAnspSupportConfig.KEY_VOICE_EUTRAN_RSRP_INT_ARRAY: + case QnsCarrierAnspSupportConfig.KEY_VIDEO_EUTRAN_RSRP_INT_ARRAY: return (T) new int[] { QnsConstants.KEY_DEFAULT_THRESHOLD_RSRP_GOOD, @@ -697,6 +699,7 @@ class QnsUtils { }; case QnsCarrierAnspSupportConfig.KEY_IDLE_UTRAN_RSCP_INT_ARRAY: case QnsCarrierAnspSupportConfig.KEY_VOICE_UTRAN_RSCP_INT_ARRAY: + case QnsCarrierAnspSupportConfig.KEY_VIDEO_UTRAN_RSCP_INT_ARRAY: return (T) new int[] { QnsConstants.KEY_DEFAULT_THRESHOLD_RSCP_GOOD, @@ -705,6 +708,7 @@ class QnsUtils { }; case QnsCarrierAnspSupportConfig.KEY_IDLE_GERAN_RSSI_INT_ARRAY: case QnsCarrierAnspSupportConfig.KEY_VOICE_GERAN_RSSI_INT_ARRAY: + case QnsCarrierAnspSupportConfig.KEY_VIDEO_GERAN_RSSI_INT_ARRAY: return (T) new int[] { QnsConstants.KEY_DEFAULT_THRESHOLD_GERAN_RSSI_GOOD, @@ -713,17 +717,12 @@ class QnsUtils { }; case QnsCarrierAnspSupportConfig.KEY_IDLE_WIFI_RSSI_INT_ARRAY: case QnsCarrierAnspSupportConfig.KEY_VOICE_WIFI_RSSI_INT_ARRAY: + case QnsCarrierAnspSupportConfig.KEY_VIDEO_WIFI_RSSI_INT_ARRAY: return (T) new int[] { QnsConstants.KEY_DEFAULT_THRESHOLD_WIFI_RSSI_GOOD, QnsConstants.KEY_DEFAULT_THRESHOLD_WIFI_RSSI_BAD }; - case QnsCarrierAnspSupportConfig.KEY_VIDEO_WIFI_RSSI_INT_ARRAY: - return (T) - new int[] { - QnsConstants.KEY_DEFAULT_THRESHOLD_VIDEO_WIFI_RSSI_GOOD, - QnsConstants.KEY_DEFAULT_THRESHOLD_VIDEO_WIFI_RSSI_BAD - }; case QnsCarrierAnspSupportConfig.KEY_OVERRIDE_WIFI_PREF_IDLE_WIFI_RSSI_INT_ARRAY: case QnsCarrierAnspSupportConfig.KEY_OVERRIDE_WIFI_PREF_VOICE_WIFI_RSSI_INT_ARRAY: case QnsCarrierAnspSupportConfig.KEY_OVERRIDE_WIFI_PREF_VIDEO_WIFI_RSSI_INT_ARRAY: |