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

Commit 7b94b450 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of c3415d2b to master"

parents f3240c1e 0c5f8dfa

core/res/res/values/config.xml

+8 −0
Original line number Diff line number Diff line
@@ -2584,6 +2584,14 @@ 
    <!-- Flag specifying whether or not IMS will use the dynamic ImsResolver -->

    <bool name="config_dynamic_bind_ims">false</bool>



    <!-- Cellular data service package name to bind to by default. If none is specified in an overlay, an

         empty string is passed in -->

    <string name="config_wwan_data_service_package" translatable="false">com.android.phone</string>



    <!-- IWLAN data service package name to bind to by default. If none is specified in an overlay, an

         empty string is passed in -->

    <string name="config_wlan_data_service_package" translatable="false"></string>



    <bool name="config_networkSamplingWakesDevice">true</bool>



    <!-- Home (non-roaming) values for CDMA roaming indicator.

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -268,6 +268,8 @@ 
  <java-symbol type="bool" name="config_dynamic_bind_ims" />

  <java-symbol type="string" name="config_wwan_network_service_package" />

  <java-symbol type="string" name="config_wlan_network_service_package" />

  <java-symbol type="string" name="config_wwan_data_service_package" />

  <java-symbol type="string" name="config_wlan_data_service_package" />

  <java-symbol type="bool" name="config_networkSamplingWakesDevice" />

  <java-symbol type="bool" name="config_showMenuShortcutsWhenKeyboardPresent" />

  <java-symbol type="bool" name="config_sip_wifi_only" />

telephony/java/android/telephony/CarrierConfigManager.java

+16 −0
Original line number Diff line number Diff line
@@ -520,6 +520,20 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL

            = "carrier_volte_override_wfc_provisioning_bool";



    /**

     * Override the device's configuration for the cellular data service to use for this SIM card.

     * @hide

     */

    public static final String KEY_CARRIER_DATA_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING

            = "carrier_data_service_wwan_package_override_string";



    /**

     * Override the device's configuration for the IWLAN data service to use for this SIM card.

     * @hide

     */

    public static final String KEY_CARRIER_DATA_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING

            = "carrier_data_service_wlan_package_override_string";



    /** Flag specifying whether VoLTE TTY is supported. */

    public static final String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL

            = "carrier_volte_tty_supported_bool";
@@ -1864,6 +1878,8 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL, true);

        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, "");

        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ESCAPED_CHARS_STRING, "");

        sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_ENCODING_STRING, "");

telephony/java/android/telephony/data/DataService.java

+5 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import android.telephony.AccessNetworkConstants; 
import android.telephony.Rlog;

import android.util.SparseArray;



import com.android.internal.annotations.VisibleForTesting;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;
@@ -105,7 +107,9 @@ public abstract class DataService extends Service { 


    private final SparseArray<DataServiceProvider> mServiceMap = new SparseArray<>();



    private final IBinder mBinder = new IDataServiceWrapper();

    /** @hide */

    @VisibleForTesting

    public final IDataServiceWrapper mBinder = new IDataServiceWrapper();



    /**

     * The abstract class of the actual data service implementation. The data service provider

telephony/java/com/android/internal/telephony/DctConstants.java

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ public class DctConstants { 
    public static final int EVENT_SET_CARRIER_DATA_ENABLED = BASE + 46;

    public static final int EVENT_DATA_RECONNECT = BASE + 47;

    public static final int EVENT_ROAMING_SETTING_CHANGE = BASE + 48;

    public static final int EVENT_DATA_SERVICE_BINDING_CHANGED = BASE + 49;



    /***** Constants *****/