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

Commit ce53935a authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Added access networks manager" am: c5a00e09 am: 1804391a 

am: e7845003

Change-Id: Ida5dfb3c9471cf1a7340bfbb22ee336c64c19b69
parents 890efce1 e7845003

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -3498,6 +3498,9 @@ 
         empty string is passed in -->

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



    <!-- Telephony qualified networks service package name to bind to by default. -->

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



    <!-- Wear devices: Controls the radios affected by Activity Mode. -->

    <string-array name="config_wearActivityModeRadios">

        <item>"wifi"</item>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ 
  <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="string" name="config_qualified_networks_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

+12 −4
Original line number Diff line number Diff line
@@ -1994,17 +1994,24 @@ public class CarrierConfigManager { 
     * the binding intent go to.

     * @hide

     */

    public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING

             = "carrier_network_service_wlan_package_override_string";

    public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING =

            "carrier_network_service_wlan_package_override_string";



    /**

     * Decides when clients try to bind to wwan (cellular) network service, which package name will

     * the binding intent go to.

     * @hide

     */

    public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING

            = "carrier_network_service_wwan_package_override_string";

    public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING =

            "carrier_network_service_wwan_package_override_string";



    /**

     * The package name of qualified networks service that telephony binds to.

     *

     * @hide

     */

    public static final String KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING =

            "carrier_qualified_networks_service_package_override_string";

    /**

     * A list of 4 LTE RSCP thresholds above which a signal level is considered POOR,

     * MODERATE, GOOD, or EXCELLENT, to be used in SignalStrength reporting.
@@ -2094,6 +2101,7 @@ 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_QUALIFIED_NETWORKS_SERVICE_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, "");