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

Commit b6d90ca1 authored by David Krause's avatar David Krause Committed by Wink Saville
Browse files

Fill in CDMA gaps and clean up ToneGenerator code

parent b0ae27f4

api/current.xml

+715 −0
Original line number Diff line number Diff line
@@ -71778,6 +71778,721 @@ 
 visibility="public"

>

</field>

<field name="TONE_CDMA_ABBR_ALERT"

 type="int"

 transient="false"

 volatile="false"

 value="97"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ABBR_INTERCEPT"

 type="int"

 transient="false"

 volatile="false"

 value="37"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ABBR_REORDER"

 type="int"

 transient="false"

 volatile="false"

 value="39"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ALERT_AUTOREDIAL_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="87"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ALERT_CALL_GUARD"

 type="int"

 transient="false"

 volatile="false"

 value="93"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ALERT_INCALL_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="91"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ALERT_NETWORK_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="86"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ANSWER"

 type="int"

 transient="false"

 volatile="false"

 value="42"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALLDROP_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="95"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_INTERGROUP"

 type="int"

 transient="false"

 volatile="false"

 value="46"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_NORMAL"

 type="int"

 transient="false"

 volatile="false"

 value="45"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PAT3"

 type="int"

 transient="false"

 volatile="false"

 value="48"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PAT5"

 type="int"

 transient="false"

 volatile="false"

 value="50"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PAT6"

 type="int"

 transient="false"

 volatile="false"

 value="51"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PAT7"

 type="int"

 transient="false"

 volatile="false"

 value="52"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_PING_RING"

 type="int"

 transient="false"

 volatile="false"

 value="49"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CALL_SIGNAL_ISDN_SP_PRI"

 type="int"

 transient="false"

 volatile="false"

 value="47"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_CONFIRM"

 type="int"

 transient="false"

 volatile="false"

 value="41"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_DIAL_TONE_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="34"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_EMERGENCY_RINGBACK"

 type="int"

 transient="false"

 volatile="false"

 value="92"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_L"

 type="int"

 transient="false"

 volatile="false"

 value="53"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_L"

 type="int"

 transient="false"

 volatile="false"

 value="71"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="80"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_SS"

 type="int"

 transient="false"

 volatile="false"

 value="74"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="77"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_PBX_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="83"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="65"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_SS"

 type="int"

 transient="false"

 volatile="false"

 value="56"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="59"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_SS_2"

 type="int"

 transient="false"

 volatile="false"

 value="62"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_HIGH_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="68"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_INTERCEPT"

 type="int"

 transient="false"

 volatile="false"

 value="36"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_KEYPAD_VOLUME_KEY_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="89"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_L"

 type="int"

 transient="false"

 volatile="false"

 value="55"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_L"

 type="int"

 transient="false"

 volatile="false"

 value="73"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="82"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_SS"

 type="int"

 transient="false"

 volatile="false"

 value="76"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="79"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_PBX_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="85"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="67"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_SS"

 type="int"

 transient="false"

 volatile="false"

 value="58"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="61"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_SS_2"

 type="int"

 transient="false"

 volatile="false"

 value="64"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_LOW_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="70"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_L"

 type="int"

 transient="false"

 volatile="false"

 value="54"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_L"

 type="int"

 transient="false"

 volatile="false"

 value="72"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="81"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_SS"

 type="int"

 transient="false"

 volatile="false"

 value="75"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="78"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_PBX_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="84"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_SLS"

 type="int"

 transient="false"

 volatile="false"

 value="66"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_SS"

 type="int"

 transient="false"

 volatile="false"

 value="57"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_SSL"

 type="int"

 transient="false"

 volatile="false"

 value="60"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_SS_2"

 type="int"

 transient="false"

 volatile="false"

 value="63"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_MED_S_X4"

 type="int"

 transient="false"

 volatile="false"

 value="69"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_NETWORK_BUSY"

 type="int"

 transient="false"

 volatile="false"

 value="40"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_NETWORK_BUSY_ONE_SHOT"

 type="int"

 transient="false"

 volatile="false"

 value="96"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_NETWORK_CALLWAITING"

 type="int"

 transient="false"

 volatile="false"

 value="43"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_NETWORK_USA_RINGBACK"

 type="int"

 transient="false"

 volatile="false"

 value="35"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_ONE_MIN_BEEP"

 type="int"

 transient="false"

 volatile="false"

 value="88"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_PIP"

 type="int"

 transient="false"

 volatile="false"

 value="44"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_PRESSHOLDKEY_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="90"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_REORDER"

 type="int"

 transient="false"

 volatile="false"

 value="38"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_SIGNAL_OFF"

 type="int"

 transient="false"

 volatile="false"

 value="98"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_CDMA_SOFT_ERROR_LITE"

 type="int"

 transient="false"

 volatile="false"

 value="94"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TONE_DTMF_0"

 type="int"

 transient="false"

include/media/ToneGenerator.h

+83 −1
Original line number Diff line number Diff line
@@ -71,6 +71,82 @@ public: 
        TONE_SUP_CONGESTION_ABBREV, // Abbreviated congestion: congestion tone limited to 4 seconds

        TONE_SUP_CONFIRM, // Confirm tone: a 350 Hz tone added to a 440 Hz tone repeated 3 times in a 100 ms on, 100 ms off cycle.

        TONE_SUP_PIP, // Pip tone: four bursts of 480 Hz tone (0.1 s on, 0.1 s off).



        // CDMA Tones

        TONE_CDMA_DIAL_TONE_LITE,

        TONE_CDMA_NETWORK_USA_RINGBACK,

        TONE_CDMA_INTERCEPT,

        TONE_CDMA_ABBR_INTERCEPT,

        TONE_CDMA_REORDER,

        TONE_CDMA_ABBR_REORDER,

        TONE_CDMA_NETWORK_BUSY,

        TONE_CDMA_CONFIRM,

        TONE_CDMA_ANSWER,

        TONE_CDMA_NETWORK_CALLWAITING,

        TONE_CDMA_PIP,



        // ISDN

        TONE_CDMA_CALL_SIGNAL_ISDN_NORMAL,  // ISDN Alert Normal

        TONE_CDMA_CALL_SIGNAL_ISDN_INTERGROUP, // ISDN Intergroup

        TONE_CDMA_CALL_SIGNAL_ISDN_SP_PRI, // ISDN SP PRI

        TONE_CDMA_CALL_SIGNAL_ISDN_PAT3,  // ISDN Alert PAT3

        TONE_CDMA_CALL_SIGNAL_ISDN_PING_RING, // ISDN Alert PING RING

        TONE_CDMA_CALL_SIGNAL_ISDN_PAT5,  // ISDN Alert PAT5

        TONE_CDMA_CALL_SIGNAL_ISDN_PAT6,  // ISDN Alert PAT6

        TONE_CDMA_CALL_SIGNAL_ISDN_PAT7,  // ISDN Alert PAT7

        // ISDN end



        // IS54

        TONE_CDMA_HIGH_L,  // IS54 High Pitch Long

        TONE_CDMA_MED_L, // IS54 Med Pitch Long

        TONE_CDMA_LOW_L, // IS54 Low Pitch Long

        TONE_CDMA_HIGH_SS, // IS54 High Pitch Short Short

        TONE_CDMA_MED_SS, // IS54 Medium Pitch Short Short

        TONE_CDMA_LOW_SS, // IS54 Low Pitch Short Short

        TONE_CDMA_HIGH_SSL, // IS54 High Pitch Short Short Long

        TONE_CDMA_MED_SSL, // IS54 Medium  Pitch Short Short Long

        TONE_CDMA_LOW_SSL, // IS54 Low  Pitch Short Short Long

        TONE_CDMA_HIGH_SS_2, // IS54 High Pitch Short Short 2

        TONE_CDMA_MED_SS_2, // IS54 Med Pitch Short Short 2

        TONE_CDMA_LOW_SS_2, // IS54 Low  Pitch Short Short 2

        TONE_CDMA_HIGH_SLS, // IS54 High Pitch Short Long Short

        TONE_CDMA_MED_SLS, // IS54 Med Pitch Short Long Short

        TONE_CDMA_LOW_SLS, // IS54 Low Pitch Short Long Short

        TONE_CDMA_HIGH_S_X4, // IS54 High Pitch Short Short Short Short

        TONE_CDMA_MED_S_X4, // IS54 Med Pitch Short Short Short Short

        TONE_CDMA_LOW_S_X4, // IS54 Low Pitch Short Short Short Short

        TONE_CDMA_HIGH_PBX_L, // PBX High Pitch Long

        TONE_CDMA_MED_PBX_L, // PBX Med Pitch Long

        TONE_CDMA_LOW_PBX_L, // PBX Low  Pitch Long

        TONE_CDMA_HIGH_PBX_SS, // PBX High Short Short

        TONE_CDMA_MED_PBX_SS, // PBX Med Short Short

        TONE_CDMA_LOW_PBX_SS, // PBX Low  Short Short

        TONE_CDMA_HIGH_PBX_SSL, // PBX High Short Short Long

        TONE_CDMA_MED_PBX_SSL, // PBX Med Short Short Long

        TONE_CDMA_LOW_PBX_SSL,  // PBX Low Short Short Long

        TONE_CDMA_HIGH_PBX_SLS, // PBX High  SLS

        TONE_CDMA_MED_PBX_SLS,  // PBX Med SLS

        TONE_CDMA_LOW_PBX_SLS, // PBX Low SLS

        TONE_CDMA_HIGH_PBX_S_X4, // PBX High SSSS

        TONE_CDMA_MED_PBX_S_X4, // PBX Med SSSS

        TONE_CDMA_LOW_PBX_S_X4, // PBX LOW SSSS

        //IS54 end

        // proprietary

        TONE_CDMA_ALERT_NETWORK_LITE,

        TONE_CDMA_ALERT_AUTOREDIAL_LITE,

        TONE_CDMA_ONE_MIN_BEEP,

        TONE_CDMA_KEYPAD_VOLUME_KEY_LITE,

        TONE_CDMA_PRESSHOLDKEY_LITE,

        TONE_CDMA_ALERT_INCALL_LITE,

        TONE_CDMA_EMERGENCY_RINGBACK,

        TONE_CDMA_ALERT_CALL_GUARD,

        TONE_CDMA_SOFT_ERROR_LITE,

        TONE_CDMA_CALLDROP_LITE,

        // proprietary end

        TONE_CDMA_NETWORK_BUSY_ONE_SHOT,

        TONE_CDMA_ABBR_ALERT,

        TONE_CDMA_SIGNAL_OFF,

        //CDMA end

        NUM_TONES,

        NUM_SUP_TONES = LAST_SUP_TONE-FIRST_SUP_TONE+1

    };
@@ -125,7 +201,7 @@ private: 
    static const unsigned char sToneMappingTable[NUM_REGIONS-1][NUM_SUP_TONES];



    static const unsigned int TONEGEN_MAX_WAVES = 3;     // Maximun number of sine waves in a tone segment

    static const unsigned int TONEGEN_MAX_SEGMENTS = 5;  // Maximun number of segments in a tone descriptor

    static const unsigned int TONEGEN_MAX_SEGMENTS = 12;  // Maximun number of segments in a tone descriptor

    static const unsigned int TONEGEN_INF = 0xFFFFFFFF;  // Represents infinite time duration

    static const float TONEGEN_GAIN = 0.9;  // Default gain passed to  WaveGenerator().
@@ -140,6 +216,8 @@ private: 
    //        correspond to tone ON state and segments with odd index to OFF state.

    //        The data stored in segments[] is the duration of the corresponding period in ms.

    //        The first segment encountered with a 0 duration    indicates that no more segment follows.

    //    - loopCnt - Number of times to repeat a sequence of seqments after playing this

    //    - loopIndx - The segment index to go back and play is loopcnt > 0

    //    - repeatCnt indicates the number of times the sequence described by segments[] array must be repeated.

    //        When the tone generator encounters the first 0 duration segment, it will compare repeatCnt to mCurCount.

    //        If mCurCount > repeatCnt, the tone is stopped automatically. Otherwise, tone sequence will be
@@ -150,6 +228,8 @@ private: 
    public:

        unsigned int duration;

        unsigned short waveFreq[TONEGEN_MAX_WAVES+1];

        unsigned short loopCnt;

        unsigned short loopIndx;

    };



    class ToneDescriptor {
@@ -174,6 +254,8 @@ private: 
    const ToneDescriptor *mpToneDesc;  // pointer to active tone descriptor

    const ToneDescriptor *mpNewToneDesc;  // pointer to next active tone descriptor



    unsigned short mLoopCounter; // Current tone loopback count



    int mSamplingRate;  // AudioFlinger Sampling rate

    AudioTrack *mpAudioTrack;  // Pointer to audio track used for playback

    Mutex mLock;  // Mutex to control concurent access to ToneGenerator object from audio callback and application API

media/java/android/media/ToneGenerator.java

+465 −168

File changed.

Preview size limit exceeded, changes collapsed.

media/libmedia/ToneGenerator.cpp

+681 −135

File changed.

Preview size limit exceeded, changes collapsed.

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

+8 −5
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ import android.util.Log; 
import android.media.ToneGenerator;



public class SignalToneUtil {

    /** A marker that isn't a valid TONE */

    public static final int CDMA_INVALID_TONE = -1;



    // public final int int IS95_CONST_IR_SIGNAL_TYPE_TYPE;

    static public final int IS95_CONST_IR_SIGNAL_TONE = 0;

    static public final int IS95_CONST_IR_SIGNAL_ISDN = 1;
@@ -76,7 +79,7 @@ public class SignalToneUtil { 
    private static Integer signalParamHash(int signalType, int alertPitch, int signal) {

        if ((signalType < 0) || (signalType > 256) || (alertPitch > 256) ||

                (alertPitch < 0) || (signal > 256) || (signal < 0)) {

            return new Integer(ToneGenerator.TONE_CDMA_INVALID);

            return new Integer(CDMA_INVALID_TONE);

        }

        return new Integer(signalType * 256 * 256 + alertPitch * 256 + signal);

    }
@@ -84,7 +87,7 @@ public class SignalToneUtil { 
    public static int getAudioToneFromSignalInfo(int signalType, int alertPitch, int signal) {

        Integer result = hm.get(signalParamHash(signalType, alertPitch, signal));

        if (result == null) {

            return ToneGenerator.TONE_CDMA_INVALID;

            return CDMA_INVALID_TONE;

        }

        return result;

    }
@@ -100,13 +103,13 @@ public class SignalToneUtil { 
                        ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_INTERGROUP);



        hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_ISDN, TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN,

                IS95_CONST_IR_SIG_ISDN_SP_PRI), ToneGenerator.TONE_CDMA_CALL_SIGNAL_SP_PRI);

                IS95_CONST_IR_SIG_ISDN_SP_PRI), ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_SP_PRI);



        hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_ISDN, TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN,

                IS95_CONST_IR_SIG_ISDN_PAT_3), ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT3);



        hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_ISDN, TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN,

                IS95_CONST_IR_SIG_ISDN_PING), ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_RING_RING);

                IS95_CONST_IR_SIG_ISDN_PING), ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PING_RING);



        hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_ISDN, TAPIAMSSCDMA_SIGNAL_PITCH_UNKNOWN,

                IS95_CONST_IR_SIG_ISDN_PAT_5), ToneGenerator.TONE_CDMA_CALL_SIGNAL_ISDN_PAT5);
@@ -163,7 +166,7 @@ public class SignalToneUtil { 
                IS95_CONST_IR_SIG_IS54B_L), ToneGenerator.TONE_CDMA_HIGH_L);



        hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_IS54B, IS95_CONST_IR_ALERT_MED,

                IS95_CONST_IR_SIG_IS54B_L), ToneGenerator.TONE_CDMA_INVALID);

                IS95_CONST_IR_SIG_IS54B_L), ToneGenerator.TONE_CDMA_MED_L);



        hm.put(signalParamHash(IS95_CONST_IR_SIGNAL_IS54B, IS95_CONST_IR_ALERT_LOW,

                IS95_CONST_IR_SIG_IS54B_L), ToneGenerator.TONE_CDMA_LOW_L);