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

Commit 360dc215 authored by Jack Yu's avatar Jack Yu
Browse files

Moved ERI configuration files from resoures to Carrier Config. 

Used Carrier Config to load correct ERI configuration file since
there are MCC/MNC shared by different carriers.

bug: 23887558
Change-Id: I61632045486929a5f0f1266fcf3b772a969d5836
parent 825fa4d5

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -1388,7 +1388,6 @@ 


  <java-symbol type="xml" name="password_kbd_qwerty" />

  <java-symbol type="xml" name="autotext" />

  <java-symbol type="xml" name="eri" />

  <java-symbol type="xml" name="password_kbd_numeric" />

  <java-symbol type="xml" name="password_kbd_qwerty_shifted" />

  <java-symbol type="xml" name="password_kbd_symbols" />

core/res/res/xml/eri.xml

deleted100644 → 0
+0 −118
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- Note that IconMode can be only 0, ON or 1, FLASHING

     The icon is turned OFF if then IconIndex = 1 -->



<EriFile VersionNumber="1357"

         NumberOfEriEntries="12"

         EriFileType="1">



         <CallPromptId Id="0"

                       CallPromptText="CallPromptId0"/>



         <CallPromptId Id="1"

                       CallPromptText="CallPromptId1"/>



         <CallPromptId Id="2"

                       CallPromptText="CallPromptId2"/>



         <EriInfo RoamingIndicator="64"

                  IconIndex="1"

                  IconMode="0"

                  EriText="T-CDMA 64"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="65"

                  IconIndex="65"

                  IconMode="0"

                  EriText="T-CDMA 65"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="66"

                  IconIndex="1"

                  IconMode="0"

                  EriText="T-CDMA Ext 66"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="67"

                  IconIndex="67"

                  IconMode="0"

                  EriText="T-CDMA Ext 67"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="68"

                  IconIndex="68"

                  IconMode="0"

                  EriText="T-CDMA Roam 68"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="69"

                  IconIndex="69"

                  IconMode="1"

                  EriText="T-CDMA Ext 69"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="70"

                  IconIndex="70"

                  IconMode="1"

                  EriText="T-CDMA Roam 70"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="71"

                  IconIndex="1"

                  IconMode="0"

                  EriText="T-CDMA Ext 71"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="72"

                  IconIndex="72"

                  IconMode="0"

                  EriText="T-CDMA Ext 72"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="73"

                  IconIndex="73"

                  IconMode="0"

                  EriText="T-CDMA Roam 73"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="74"

                  IconIndex="74"

                  IconMode="1"

                  EriText="T-CDMA Ext 74"

                  CallPromptId="0"

                  AlertId="0"/>



         <EriInfo RoamingIndicator="75"

                  IconIndex="75"

                  IconMode="1"

                  EriText="T-CDMA Roam 75"

                  CallPromptId="0"

                  AlertId="0"/>



</EriFile>

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -426,6 +426,13 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_METERED_APN_TYPES_STRINGS =

            "carrier_metered_apn_types_strings";



    /**

     * CDMA carrier ERI (Enhanced Roaming Indicator) file name

     * @hide

     */

    public static final String KEY_CARRIER_ERI_FILE_NAME_STRING =

            "carrier_eri_file_name_string";



    /* The following 3 fields are related to carrier visual voicemail. */



    /**
@@ -705,6 +712,7 @@ public class CarrierConfigManager { 
                "max_retries=3, 5000, 5000, 5000");

        sDefaults.putLong(KEY_CARRIER_DATA_CALL_APN_DELAY_DEFAULT_LONG, 20000);

        sDefaults.putLong(KEY_CARRIER_DATA_CALL_APN_DELAY_FASTER_LONG, 3000);

        sDefaults.putString(KEY_CARRIER_ERI_FILE_NAME_STRING, "eri.xml");

        sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200);

        sDefaults.putStringArray(KEY_CARRIER_METERED_APN_TYPES_STRINGS,

                new String[]{"default", "mms", "dun", "supl"});