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

Commit ee1f6a8a authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Add KEY_REGIONAL_SATELLITE_EARFCN_BUNDLE to carrierconfig" into main

parents 47997c9e 4de1ed48
Loading
Loading
Loading
Loading
+32 −0
Original line number Diff line number Diff line
@@ -9733,6 +9733,35 @@ public class CarrierConfigManager {
    public static final String KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE =
            "carrier_supported_satellite_services_per_provider_bundle";
    /**
     * A PersistableBundle that contains a list of key-value pairs, where the values are integer
     * arrays.
     * <p>
     * Keys are the IDs of regional satellite configs as strings and values are
     * integer arrays of earfcns in the corresponding regions.
     *
     * An example config for two regions "1" and "2":
     * <pre>{@code
     * <carrier_config>
     *   <pbundle_as_map name="regional_satellite_earfcn_bundle">
     *     <int-array name = "1" num = "2">
     *       <item value = "100"/>
     *       <item value = "200"/>
     *     </int-array>
     *     <int-array name = "2" num = "1">
     *       <item value = "200"/>
     *     </int-array>
     *   </pbundle_as_map>
     * </carrier_config>
     * }</pre>
     * <p>
     * This config is empty by default.
     * @hide
     */
    @FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
    public static final String KEY_REGIONAL_SATELLITE_EARFCN_BUNDLE =
            "regional_satellite_earfcn_bundle";
    /**
     * This config enables modem to scan satellite PLMNs specified as per
     * {@link #KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE} and attach to same
@@ -11264,6 +11293,9 @@ public class CarrierConfigManager {
        sDefaults.putPersistableBundle(
                KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE,
                PersistableBundle.EMPTY);
        sDefaults.putPersistableBundle(
                KEY_REGIONAL_SATELLITE_EARFCN_BUNDLE,
                PersistableBundle.EMPTY);
        sDefaults.putBoolean(KEY_SATELLITE_ATTACH_SUPPORTED_BOOL, false);
        sDefaults.putInt(KEY_SATELLITE_CONNECTION_HYSTERESIS_SEC_INT, 180);
        sDefaults.putIntArray(KEY_NTN_LTE_RSRP_THRESHOLDS_INT_ARRAY,