28464 Commits

Author SHA1 Message Date
Hung-ying Tyan
f21d4ed7b8 am 51128faa: am d122805b: CallManager: add getAllPhones().
Merge commit '51128faa8cf1f3d25ee7db745b9e18e69e04cd31'

* commit '51128faa8cf1f3d25ee7db745b9e18e69e04cd31':
  CallManager: add getAllPhones().
2010-08-09 19:59:43 -07: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
Tony Wu
fc71125104 Fix isUsbMassStorageConnected() will always return true
After UMS mounted, isUsbMassStorageConnected() will always return true even if USB is disconnected.
It's because mUmsEnabling will always be ture.

Change-Id: Ib24b2359ea2684eb0a9faeb880f383e87630e6e1
2010-08-10 10:09:13 +08:00
Manuel Roman
53aa7afe29 Merge "Incorporated Joe's comments" 2010-08-09 18:57:45 -07:00
Manuel Roman
2c96a0c7ac Incorporated Joe's comments
Change-Id: I07f9b00282acb5e1b505b578e6fae1dcb90d1e52
2010-08-09 18:53:09 -07:00
Jeff Brown
88cf2fca38 Optimize VelocityTracker to run in linear time.
Uses a linked list for efficient pointer addition and removal.
When possible, makes use of the fact that pointer ids are usually in
sorted order to avoid quadratic time lookups when adding new data.
Fixed an incorrect assumption that the pointer count would always change
when old pointers were removed.

Also fixed a bug in InputQueue FinishedCallback recycling.

Change-Id: Ie048d3bb022d39cf4185e2fe43923a861d94c4f3
2010-08-09 18:50:35 -07:00
Brett Chabot
56718cb1cb Fix gingerbread FrameworkCoreTests makefile.
android-common should be included as a static library.

Change-Id: I539962904c84ef30e6d7bd1b48d0bc07e0757d58
2010-08-09 18:49:54 -07:00
Mathias Agopian
8daae8f149 improve a bit the implementation of eglGetProcAddress
Change-Id: Ie07f33ae2162830df1e4f3d3b5e00fcfb8c350d6
2010-08-09 18:35:43 -07:00
Jason Sams
b28ca96fd6 Refcounting in allocations.
Change-Id: Ida2dfb404b2cd832e622d981d73a938d5bc5b821
2010-08-09 18:13:33 -07:00
Dmitri Plotnikov
09328a254b Removing closed cursor on stop
The client of the loader may have already closed the cursor,
so we need to forget it, otherwise the closed cursor
will be redelivered on start.


Change-Id: I30e005ea0827966956bc276a2d3d7b13c95850af
2010-08-09 18:01:31 -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
Dianne Hackborn
aebf9ea3a8 Merge "This may fix LoaderManager bug where a closed cursor could be used." 2010-08-09 16:57:18 -07:00
Dianne Hackborn
debb2e25b3 This may fix LoaderManager bug where a closed cursor could be used.
Change-Id: I362d5f86dcbdbede921ef9d29c849ed6401850ea
2010-08-09 16:32:52 -07:00
Adam Powell
78aa1f0b5e Fix a bug where canceled action modes show a bar anyway
Change-Id: I8fcdc047f303db4c8aa9f1902e37bb4e5f469620
2010-08-09 16:18:12 -07:00
Eric Rowe
301c437b55 Remove @LargeTest annotations
Change-Id: Ib7e6f6e8b6437db5ca2ad2bcb89f079a0cbf7453
2010-08-09 15:35:48 -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
Jason Sams
05716aa0a1 Update image processing to cleaup code by not inlining
functions that should be handled by the runtime.

Change-Id: I54c590913285bceb02a9076dbe6355d6f6bc6661
2010-08-09 12:09:36 -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
Mike Lockwood
fce21b5a33 Merge "MTP: Fix reading and writing property descriptors" 2010-08-09 11:55:40 -07:00
Mike Lockwood
97c8d9046e MTP: Fix reading and writing property descriptors
We were missing support for the group code, resulting in an off by 4 bytes problem.

Change-Id: I4a640c67b8d36e1bd658b6185178a71966d4b0b6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-09 14:49:28 -04: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
Mike Lockwood
7ebcd43fbd Merge changes Ia95ff014,Ib31708c3
* changes:
  MTP: Add debug code for printing names of MTP format and property codes.
  MTP: Fix some typos
2010-08-09 11:38:29 -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
Mike Lockwood
d3793f38f9 MTP: Add debug code for printing names of MTP format and property codes.
Change-Id: Ia95ff014cec8720d01091fa30764011089076fe8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-09 14:18:59 -04:00
Mike Lockwood
c642e8a44c MTP: Fix some typos
Change-Id: Ib31708c3a925e3c0ab8eea6922ab09e02b740936
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-09 14:17:52 -04:00
Eric Laurent
67400d492b Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread 2010-08-09 10:42:27 -07:00
Maksymilian Osowski
3df4eab3de Added generating text summary to Summarizer.
Change-Id: I8768403b0e4edd46132018c9da6de54b218fb594
2010-08-09 18:15:33 +01: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
Romain Guy
02890fd0f9 Replace Bitmap's finalizers with PhantomReferences.
This change also removes the use of SoftReferences for View's
drawing cache.

A bitmap now creates a PhantomReference enqueued in a reference
queue provided by the new Finalizers class. This queue is polled
from a thread started after forking zygote. That thread is in charge
of clearing the references after GC runs and of calling reclaim()
on them. The reclaim() method is now how finalizers are run.

Note that a PhantomReference cannot be kept in the instance it
refers to, which is why they are kept in a separate List.

Change-Id: If3c1a5e9dc23fa49e34857860d730f5cf5ad5926
2010-08-09 09:44:40 -07:00
Steve Block
8576301c38 Merge WebKit at r64523 : Update WebView useragent string
Change-Id: I21c0660b7b14aa123aead0c66f49e4f3b013741b
2010-08-09 15:39:50 +01:00
Steve Block
6618e69857 Merge WebKit at r64523 : Add new LayoutTest fast/dom/DeviceOrientation/basic-operation.html to skipped list
Change-Id: I42afa8d430349a0d8aa7349563c90043d08452e1
2010-08-09 15:39:50 +01:00
Maksymilian Osowski
d689c784af Merge "Added crash-detection mechanism." 2010-08-09 06:36:39 -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