Commit Graph

25369 Commits

Author SHA1 Message Date
Hung-ying Tyan
f13542f2eb am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread
Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp

* commit '259b4c860212dd528b25d1cce6e74be01afed85c':
  SIP: clean up unused class and fields.
2010-08-09 22:37:46 -07:00
Hung-ying Tyan
259b4c8602 Merge "SIP: clean up unused class and fields." into gingerbread 2010-08-09 22:30:58 -07:00
Hung-ying Tyan
8e63ddb4c7 SIP: clean up unused class and fields.
Change-Id: I79ed7fb324fea9a52946340055b5ea1d389a926a
2010-08-10 12:00:45 +08:00
Jaikumar Ganesh
4a671a7452 am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
Merge commit '745d1e905886ed0d8fa0a8590463093d125bc53a' into gingerbread-plus-aosp

* commit '745d1e905886ed0d8fa0a8590463093d125bc53a':
  Update javadoc for the API and change return of getBondedDevices().
2010-08-09 19:53:57 -07:00
Konstantin Lopyrev
8cdf4d92ec am 6c6d57c6: Merge "Fix focus notification" into gingerbread
Merge commit '6c6d57c6a04eed154de1f7d9b544c2cb34a83dac' into gingerbread-plus-aosp

* commit '6c6d57c6a04eed154de1f7d9b544c2cb34a83dac':
  Fix focus notification
2010-08-09 19:53:48 -07:00
Konstantin Lopyrev
75493be9c0 am 63cca691: Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread
Merge commit '63cca69157eae17da2a5492d1bcb7330061a52ac' into gingerbread-plus-aosp

* commit '63cca69157eae17da2a5492d1bcb7330061a52ac':
  Make sure profiling is done only for views that are actually measured, laid out and drawn.
2010-08-09 19:53:44 -07:00
Jean-Michel Trivi
2f5f154d6a am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread
Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp

* commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
  Fix bug 2684341 Don't steal the media button event from the phone
2010-08-09 19:53:20 -07:00
Jaikumar Ganesh
4e25db6a51 am cbaef518: Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread
Merge commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d' into gingerbread-plus-aosp

* commit 'cbaef51847ab8d8c4d039f0e425d434811f77f0d':
  Check whether Bluetooth is enabled before making any API calls.
2010-08-09 19:53:16 -07:00
James Dong
fa4f57fe0f am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread
Merge commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp

* commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f':
  Support multiple PPS and SPS in avcC box
2010-08-09 19:53:12 -07:00
Andreas Huber
e14923b0c8 am 4edf85ab: Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread
Merge commit '4edf85abc919b7d0e8db71c0c6166c7994269830' into gingerbread-plus-aosp

* commit '4edf85abc919b7d0e8db71c0c6166c7994269830':
  Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
2010-08-09 19:53:01 -07:00
Eric Laurent
18afcee767 am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread
Merge commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0' into gingerbread-plus-aosp

* commit '67400d492bfd1f1a8a3d03dc93957a1467f4c7d0':
  Added tests for audio effects in MediaFrameworkTest
2010-08-09 19:52:53 -07:00
Eric Laurent
1ece7d6873 am 2a6b80bc: Fixed several audio effects problems.
Merge commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee' into gingerbread-plus-aosp

* commit '2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee':
  Fixed several audio effects problems.
2010-08-09 19:52:43 -07:00
Hung-ying Tyan
8b8b453631 am 8fb2e6e4: PhoneFactory: add makeSipPhone()
Merge commit '8fb2e6e4720385961083a150a3e848ccaef544ae' into gingerbread-plus-aosp

* commit '8fb2e6e4720385961083a150a3e848ccaef544ae':
  PhoneFactory: add makeSipPhone()
2010-08-09 19:52:28 -07:00
Hung-ying Tyan
51128faa8c am d122805b: CallManager: add getAllPhones().
Merge commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56' into gingerbread-plus-aosp

* commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56':
  CallManager: add getAllPhones().
2010-08-09 19:52:19 -07:00
Jaikumar Ganesh
745d1e9058 Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread 2010-08-09 17:30:25 -07:00
Konstantin Lopyrev
6c6d57c6a0 Merge "Fix focus notification" into gingerbread 2010-08-09 17:03:10 -07:00
Konstantin Lopyrev
63cca69157 Merge "Make sure profiling is done only for views that are actually measured, laid out and drawn." into gingerbread 2010-08-09 17:02:39 -07:00
Jaikumar Ganesh
fec86f4aa2 Update javadoc for the API and change return of getBondedDevices().
getBondedDevices() *might* work if called before the Bluetooth
State intent is broadcasted. However, this can cause ANRs and problems.
This API was updated to return null, if called before the intent
is received. However, this might cause existing apps to crash. Return
an empty set instead.

Change-Id: Ibc484d3394aa0bbebd651221efde6a7015ce7110
2010-08-09 17:01:21 -07:00
Konstantin Lopyrev
5e7833a571 Fix focus notification
Change-Id: I51d73100695ceb70620754a1897ace681a26d839
2010-08-09 17:01:11 -07:00
Jean-Michel Trivi
66edf558a9 Merge "Fix bug 2684341 Don't steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread 2010-08-09 14:19:08 -07:00
Jaikumar Ganesh
cbaef51847 Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread 2010-08-09 13:50:28 -07:00
Jaikumar Ganesh
f5ff170be1 Check whether Bluetooth is enabled before making any API calls.
For example, Settings app makes calls to get Bonded Devices
before Bluetooth is on. This leads to ANRs and will
prevent autoconnection.

Change-Id: I56748a9bd1d603b5782c17775c6b20b831bf6572
2010-08-09 13:49:40 -07:00
James Dong
959909ef28 Merge "Support multiple PPS and SPS in avcC box" into gingerbread 2010-08-09 13:35:54 -07:00
James Dong
481e05ea0d Support multiple PPS and SPS in avcC box
- Also
o do not use the hard-coded profile and levels.
  Instead, we are using the profile and level found in the codec config data
o we are not supporting FRExt profile and levels for now, which requires
  additional seq parameter set extension for instance.

Change-Id: If695b4c996d073d8e48aa45fdd7001e9f016f375
2010-08-09 12:04:30 -07:00
Jean-Michel Trivi
e73131a684 Fix bug 2684341 Don't steal the media button event from the phone
app is the phone is ringing, even in silent mode.

Use the PhoneStateListener to know whether the phone is ringing,
as the mode is not MODE_RINGTONE when ringing in silent mode.

Change-Id: Iede350cecde0b663d50f9b4a57f9a9ef08066c0d
2010-08-09 11:48:20 -07:00
Andreas Huber
4edf85abc9 Merge "Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder." into gingerbread 2010-08-09 11:30:34 -07:00
Eric Laurent
67400d492b Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread 2010-08-09 10:42:27 -07:00
Andreas Huber
520b2a7039 Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
Change-Id: I92685d09456c220b8c09842defb721bd55b0b9f6
related-to-bug: 2900021
2010-08-09 10:01:26 -07:00
Eric Laurent
2a6b80bc65 Fixed several audio effects problems.
- Fixed constant inversions in AudioEffect.java
- Do not return error when enabling an already enabled effect
- Update cached effect state in native AudioEffect class when effect is enabled/disabled by command() method
- Remove click when restarting effect during disable sequence
- Fixed problem in master mute management when volume control is delegated to effect.

Change-Id: I6df4ce9fcc54fdc7345df858f639d20d802d6712
2010-08-09 05:48:20 -07:00
Eric Laurent
441ec6bd10 Added tests for audio effects in MediaFrameworkTest
This CL adds a set of automated functional tests for the AudioEffect class
and the following derived classes:
BassBoost, Equalizer, Virtualizer and Visualizer.

These tests require the following file on the SD card:
/sdcard/media_api/music/sine_200+1000Hz_44K_mo.wav

Change-Id: I6ec3ec6f9ede10ccf2dd3b1e9ee4b08396740dee
2010-08-09 05:19:49 -07:00
Hung-ying Tyan
8fb2e6e472 PhoneFactory: add makeSipPhone()
Change-Id: I8e7abb0623724d24c6f82829ff06663a31ba32fb
2010-08-09 17:15:35 +08:00
Hung-ying Tyan
d122805bbf CallManager: add getAllPhones().
Change-Id: I50589aaec55925d93c392f15a22c70d2a6634b87
2010-08-09 16:14:15 +08:00
Dan Egnor
6f50a95680 am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit '799f2bb04102b4b692b52eed5c36aea9a8cde471' into gingerbread-plus-aosp

* commit '799f2bb04102b4b692b52eed5c36aea9a8cde471':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:59:49 -07:00
Dan Egnor
799f2bb041 am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo
Merge commit 'b37bca9e79489a1abd848ce762bb7d87203b3414' into gingerbread

* commit 'b37bca9e79489a1abd848ce762bb7d87203b3414':
  COMMENT ONLY change to fix some formatting glitches and
2010-08-06 18:55:05 -07:00
Andreas Huber
c143ae7eb7 am ad98d383: Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
Merge commit 'ad98d383a04fce08a147b200e23b12f12b2681a3' into gingerbread-plus-aosp

* commit 'ad98d383a04fce08a147b200e23b12f12b2681a3':
  Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
2010-08-06 18:54:31 -07:00
Andreas Huber
4f25d03382 am 261aaa16: Merge "Properly skip the \'skip\' chunk in mpeg4 files." into gingerbread
Merge commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba' into gingerbread-plus-aosp

* commit '261aaa16a2f469d7f3d3b56f1a45432460ee4dba':
  Properly skip the 'skip' chunk in mpeg4 files.
2010-08-06 18:54:26 -07:00
Steve Howard
d49d4031d6 am 9fbf00cb: Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread
Merge commit '9fbf00cb041eeb22acad93deace9712c57b4c594' into gingerbread-plus-aosp

* commit '9fbf00cb041eeb22acad93deace9712c57b4c594':
  Slight improvement (hopefully) to orientation sensing.
2010-08-06 18:54:22 -07:00
Konstantin Lopyrev
443f9bafb0 am 3b0d3d51: Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread
Merge commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8' into gingerbread-plus-aosp

* commit '3b0d3d51412aa90ac3e334f1e0c4b7adb0e124f8':
  Adding a way for Hierarchy Viewer to get the focused window.
2010-08-06 18:54:18 -07:00
Steve Howard
f0857005b2 am db86c59e: New drawables for the update to the maps API (DO NOT MERGE)
Merge commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d' into gingerbread-plus-aosp

* commit 'db86c59e6280cb2ebeeda09ba8dee4a1440dea1d':
  New drawables for the update to the maps API (DO NOT MERGE)
2010-08-06 18:54:13 -07:00
Steve Howard
974c993fc3 am 8e15afe7: Make downloads visible by default.
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp

* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
  Make downloads visible by default.
2010-08-06 18:54:03 -07:00
Kenny Root
d7ce227bcb am 818490ab: Fix String8::operator+
Merge commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c' into gingerbread-plus-aosp

* commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c':
  Fix String8::operator+
2010-08-06 18:53:48 -07:00
Dan Egnor
b37bca9e79 Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo 2010-08-06 16:39:02 -07:00
Andreas Huber
ad98d383a0 Support for communicating if a buffer read from the _extractor_ is a sync sample or not.
Change-Id: Ie71506224d937cfff1fa1273bfac31c47db8845f
related-to-bug: 2900534
2010-08-06 15:46:17 -07:00
Konstantin Lopyrev
c6dc45700b Make sure profiling is done only for views that are actually measured, laid out and drawn.
Change-Id: I88c66e882be2781d079c51b6580a19c4e359c5b1
2010-08-06 15:41:33 -07:00
Andreas Huber
261aaa16a2 Merge "Properly skip the 'skip' chunk in mpeg4 files." into gingerbread 2010-08-06 15:21:47 -07:00
Andreas Huber
765b8aa8de Properly skip the 'skip' chunk in mpeg4 files.
Change-Id: I6795347f91f24d5379e8dc80a24ae016a9629c9c
related-to-bug: 2901311
2010-08-06 15:02:54 -07:00
Steve Howard
9fbf00cb04 Merge "Slight improvement (hopefully) to orientation sensing." into gingerbread 2010-08-06 14:28:37 -07:00
Konstantin Lopyrev
3b0d3d5141 Merge "Adding a way for Hierarchy Viewer to get the focused window." into gingerbread 2010-08-06 14:10:29 -07:00
Konstantin Lopyrev
f962476471 Adding a way for Hierarchy Viewer to get the focused window.
Change-Id: I01e6ab4aa24d632fba586cb9e112d8d9df1a681a
2010-08-06 13:27:31 -07:00
Steve Howard
db86c59e62 New drawables for the update to the maps API (DO NOT MERGE)
Manual merge from master.

Change-Id: I97ad9daff6036e5c7b9e946b53191574c8b0b6ed
2010-08-06 13:10:25 -07:00