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

Commit e92b1e76 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am d48388ab: Merge change 5344 into donut 

Merge commit 'd48388ab'

* commit 'd48388ab':
  frameworks/base: CDMA voicemail support
parents 2377dc99 d48388ab

telephony/java/android/telephony/TelephonyManager.java

+15 −0
Original line number Diff line number Diff line
@@ -611,6 +611,21 @@ public class TelephonyManager { 
        return null;

    }



    /**

     * Returns the voice mail count.

     * <p>

     * Requires Permission:

     *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     * @hide

     */

    public int getVoiceMessageCount() {

        try {

            return getITelephony().getVoiceMessageCount();

        } catch (RemoteException ex) {

        }

        return 0;

    }



    /**

     * Retrieves the alphabetic identifier associated with the voice

     * mail number.

telephony/java/com/android/internal/telephony/ITelephony.aidl

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ interface ITelephony { 
    /**

      * Returns the unread count of voicemails

      */

    int getCountVoiceMessages();

    int getVoiceMessageCount();



}

telephony/java/com/android/internal/telephony/IccRecords.java

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ public abstract class IccRecords extends Handler implements IccConstants { 
     * If not available (eg, on an older CPHS SIM) -1 is returned if

     * getVoiceMessageWaiting() is true

     */

    public int getCountVoiceMessages() {

    public int getVoiceMessageCount() {

        return countVoiceMessages;

    }

telephony/java/com/android/internal/telephony/Phone.java

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ public interface Phone { 
     * Returns unread voicemail count. This count is shown when the  voicemail

     * notification is expanded.<p>

     */

    int getCountVoiceMessages();

    int getVoiceMessageCount();



    /**

     * Returns the alpha tag associated with the voice mail number.

telephony/java/com/android/internal/telephony/PhoneBase.java

+6 −1
Original line number Diff line number Diff line
@@ -651,6 +651,11 @@ public abstract class PhoneBase implements Phone { 
        mNotifier.notifyDataActivity(this);

    }



    public void notifyMessageWaitingIndicator() {

        // This function is added to send the notification to DefaultPhoneNotifier.

        mNotifier.notifyMessageWaitingChanged(this);

    }



    public void notifyDataConnection(String reason) {

        mNotifier.notifyDataConnection(this, reason);

    }
@@ -658,7 +663,7 @@ public abstract class PhoneBase implements Phone { 
    public abstract String getPhoneName();



    /** @hide */

    public int getCountVoiceMessages(){

    public int getVoiceMessageCount(){

        return 0;

    }