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

Commit d0fec9cd authored by Naveen Kalla's avatar Naveen Kalla Committed by Android Git Automerger
Browse files

am 104d3f75: Merge change I6c84d731 into eclair-mr2 

Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp

* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
  Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
parents 05250b37 adf7d777

media/libmedia/ToneGenerator.cpp

+2 −1
Original line number Diff line number Diff line
@@ -224,7 +224,8 @@ const ToneGenerator::ToneDescriptor ToneGenerator::sToneDescriptors[] = { 
                      { duration: 0 , waveFreq: { 0 }, 0, 0}},

          repeatCnt: 2,

          repeatSegment: 0 },                              // TONE_CDMA_CONFIRM

        { segments: { { duration: 0, waveFreq: { 0 }, 0, 0 }},

        { segments: { { duration: 500, waveFreq: { 660, 1000, 0 }, 0, 0 },

                      { duration: 0 , waveFreq: { 0 }, 0, 0}},

          repeatCnt: 0,

          repeatSegment: 0 },                              // TONE_CDMA_ANSWER

        { segments: { { duration: 300, waveFreq: { 440, 0 }, 0, 0 },