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

Commit 6c5d9a06 authored by Samyeoul Choi's avatar Samyeoul Choi Committed by Android Git Automerger
Browse files

am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint 

* commit '09223891':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
parents 66edf2bb 09223891

core/res/res/values/config.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -399,4 +399,7 @@ 
    <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->

    <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->

    <string-array name="config_twoDigitNumberPattern">

    <string-array name="config_twoDigitNumberPattern">

    </string-array>

    </string-array>



    <!-- The VoiceMail default value is displayed to my own number if it is true -->

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

</resources>
 
</resources>

telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java

+8 −1
Original line number Original line Diff line number Diff line
@@ -737,7 +737,14 @@ public class CDMAPhone extends PhoneBase { 
        String number = null;

        String number = null;

        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());

        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());

        // TODO: The default value of voicemail number should be read from a system property

        // TODO: The default value of voicemail number should be read from a system property



        // Read platform settings for dynamic voicemail number

        if (getContext().getResources().getBoolean(com.android.internal

                .R.bool.config_telephony_use_own_number_for_voicemail)) {

            number = sp.getString(VM_NUMBER_CDMA, getLine1Number());

        } else {

            number = sp.getString(VM_NUMBER_CDMA, "*86");

            number = sp.getString(VM_NUMBER_CDMA, "*86");

        }

        return number;

        return number;

    }

    }