Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bc1bfa5 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Reconciliate differences in code order wrt AOSP master. DO NOT MERGE 

This should resolve the Automerger conflict in the merge path from
mirror-aosp-master. Cf. stage-aosp-master:
https://googleplex-android.git.corp.google.com/platform/frameworks/base/+/61719eca99b8c12ec8241d92b65c68a13c3fe40d/telephony/java/android/telephony/CarrierConfigManager.java#3041
vs mirror-aosp-master:
https://googleplex-android.git.corp.google.com/platform/frameworks/base/+/ae03bdf7c134bd29068915f6241669fb309009c6/telephony/java/android/telephony/CarrierConfigManager.java#2990

DO NOT MERGE makes this propagate to qt-qpr1-dev-plus-aosp which needs it:
https://googleplex-android.git.corp.google.com/platform/frameworks/base/+/65da5d0a2c5da78335998995efb52f7246c3ca2f/telephony/java/android/telephony/CarrierConfigManager.java#3041
leaving master which already has it:
https://googleplex-android.git.corp.google.com/platform/frameworks/base/+/c5f436ec5e91b957a3a214faa801f0271d7a0557/telephony/java/android/telephony/CarrierConfigManager.java#3036

Bug: 148598085
Test: Forrest build: https://android-build.googleplex.com/builds/forrest/run/L16500000445659922
Change-Id: I73d5098e265860d48d7dc687a9ded7a9ce903fca
parent 61719eca

telephony/java/android/telephony/CarrierConfigManager.java

+8 −9
Original line number Diff line number Diff line
@@ -2986,6 +2986,12 @@ public class CarrierConfigManager { 
    public static final String KEY_PING_TEST_BEFORE_DATA_SWITCH_BOOL =

            "ping_test_before_data_switch_bool";



    /**

     * Controls time in milliseconds until DcTracker reevaluates 5G connection state.

     * @hide

     */

    public static final String KEY_5G_WATCHDOG_TIME_MS_LONG =

            "5g_watchdog_time_long";

    /**

     * Controls whether to switch data to primary from opportunistic subscription

     * if primary is out of service. This control only affects system or 1st party app
@@ -3034,13 +3040,6 @@ public class CarrierConfigManager { 
    public static final String KEY_OPPORTUNISTIC_NETWORK_MAX_BACKOFF_TIME_LONG =

            "opportunistic_network_max_backoff_time_long";



    /**

     * Controls time in milliseconds until DcTracker reevaluates 5G connection state.

     * @hide

     */

    public static final String KEY_5G_WATCHDOG_TIME_MS_LONG =

            "5g_watchdog_time_long";



    /**

     * Indicates zero or more emergency number prefix(es), because some carrier requires

     * if users dial an emergency number address with a specific prefix, the combination of the
@@ -3862,6 +3861,8 @@ public class CarrierConfigManager { 
        /* Default value is 3 seconds. */

        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_EXIT_HYSTERESIS_TIME_LONG, 3000);

        sDefaults.putBoolean(KEY_PING_TEST_BEFORE_DATA_SWITCH_BOOL, true);

        /* Default value is 1 hour. */

        sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);

        sDefaults.putBoolean(KEY_SWITCH_DATA_TO_PRIMARY_IF_PRIMARY_IS_OOS_BOOL, true);

        /* Default value is 60 seconds. */

        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_PING_PONG_TIME_LONG, 60000);
@@ -3869,8 +3870,6 @@ public class CarrierConfigManager { 
        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_BACKOFF_TIME_LONG, 10000);

        /* Default value is 60 seconds. */

        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_MAX_BACKOFF_TIME_LONG, 60000);

        /* Default value is 1 hour. */

        sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);

        sDefaults.putAll(Gps.getDefaults());

        sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY,

                new int[] {