Commit Graph

45986 Commits

Author SHA1 Message Date
Dianne Hackborn
731757ccbe am a2e0e3b5: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1
* commit 'a2e0e3b5f63dc741fd5e54f45f8dde1a3cb58c6c':
  Fix issue #6073913: onActivityResult() not getting called...
2012-02-28 15:07:43 -08:00
Dianne Hackborn
a196c9116e am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
2012-02-28 15:03:28 -08:00
Dianne Hackborn
173e455381 am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1
* commit '27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
  Fix issue #6073913: onActivityResult() not getting called...
2012-02-28 15:03:18 -08:00
Dianne Hackborn
0003f917f0 Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 2012-02-28 15:01:05 -08:00
felipeal
ee614e7017 am 635d492d: (-s ours) am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '635d492d5918fe11a3a9bb9d9a87839a8331d34b':
2012-02-28 14:59:29 -08:00
felipeal
d378afb386 am 96236bc8: (-s ours) am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '96236bc8d93efc0573a18b87699d56a3ed8c0b0b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
2012-02-28 14:59:26 -08:00
Jean-Baptiste Queru
9f841a4f8f am ccd08b8d: am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit 'ccd08b8de9dc4c9cfaee93cbbcc7053cc9e8d96f':
  Fixes update of extras Bundle in new Locations for GPS Provider
2012-02-28 14:59:18 -08:00
Michael Jurka
564a380684 Merge "Add shortcut for voice search" 2012-02-28 14:40:33 -08:00
James Dong
09804e47e1 Merge "Fix API issues in DrmRights class." 2012-02-28 14:34:02 -08:00
James Dong
b9de137e27 Merge "Deprecate default constructor for classes that should have been meant to be interfaces" 2012-02-28 14:33:19 -08:00
felipeal
e239bd87b2 am 4bcc9108: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '4bcc910817c694c8d8b20e39a5ff42c584af1d49':
2012-02-28 14:09:43 -08:00
felipeal
35ef14c5e4 am fa73815e: am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit 'fa73815e1d953e67c635877440e717dc84465d97':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
2012-02-28 14:07:26 -08:00
felipeal
258bab7ce6 am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
2012-02-28 14:05:23 -08:00
felipeal
3c1468cfbf am e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit 'e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
  DO NOT MERGE (from master: Fixed minor typo on Javadoc)
2012-02-28 14:04:20 -08:00
Eric Fischer
849fd75c9b Merge "Import translations. DO NOT MERGE" 2012-02-28 13:56:29 -08:00
Eric Fischer
3eca79c574 Merge "Import translations. DO NOT MERGE" 2012-02-28 13:55:24 -08:00
Jean-Baptiste Queru
5f52a39038 am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit 'e939edb5b4e991998ae8219b03d75c10cdc765cb':
  Fixes update of extras Bundle in new Locations for GPS Provider
2012-02-28 13:53:17 -08:00
Jean-Baptiste Queru
3d29dab960 am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit 'f418738c64413b818e2dc507c912c2678876632f':
  Fixes update of extras Bundle in new Locations for GPS Provider
2012-02-28 13:33:44 -08:00
Jean-Baptiste Queru
84c7c01ea7 am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"
* commit 'd7fa7deef9bc0cf22bf450fdb062327697c087c4':
  Fixes update of extras Bundle in new Locations for GPS Provider
2012-02-28 13:30:39 -08:00
Jeff Sharkey
4298b2964a Merge "Suppress StrictMode in handleBindApplication()." 2012-02-28 13:21:04 -08:00
James Dong
c6f989c6f9 Merge "Remove unnecessary header file includes for drmserver" 2012-02-28 13:09:44 -08:00
James Dong
b9c8dcdb82 Merge "Added missing javadoc comment for public API in DrmUtils class" 2012-02-28 13:09:24 -08:00
Jason Noguchi
d259166bd0 am bb189574: am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'bb189574614d1ce8f9d61e58b7aebbd18f0d6c25':
2012-02-28 11:57:39 -08:00
Jason Noguchi
f4b8e8fc9c am a1de5e48: am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'a1de5e48125797b5a6fcc43b68ddfd3d9d831e87':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:55:13 -08:00
Jason Noguchi
e2f8d497ce am eac4b187: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'eac4b187d357eac61475c4dc6f673656e08e75a9':
2012-02-28 11:53:49 -08:00
Jason Noguchi
f46bc318a2 am 743aceec: am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '743aceec4289508a8c514dae7319659cf7f278c4':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:52:56 -08:00
Jason Noguchi
d53894e015 am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:50:14 -08:00
Jason Noguchi
51e749a0fd am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit 'ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
  Adding time lapse test to mediaframework stress suite.
2012-02-28 11:49:30 -08:00
Jason Noguchi
e81927cf9a Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 2012-02-28 11:47:46 -08:00
John Reck
74c9a3bc94 Merge "Fix cursorRingBounds NPE" 2012-02-28 11:40:00 -08:00
John Reck
ed66e1b988 Merge "Fix NPE" 2012-02-28 11:38:56 -08:00
Dianne Hackborn
eb040a1f19 Merge "You could think of this as what an OEM might do." 2012-02-28 11:26:02 -08:00
James Dong
a9e4401f15 Merge "Deprecated a mis-spelled method and replaced it with a new method" 2012-02-28 11:23:26 -08:00
Android Git Automerger
c1bf2237ca am a66926ff: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit 'a66926ff7fac7ef77da1b5f3f1a1dd9dd8d6b960':
2012-02-28 10:51:35 -08:00
Svetoslav Ganov
7a415d2d60 am 8f4582a2: am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '8f4582a278d3f93450f2a72ad6f6dc872668efb9':
2012-02-28 10:51:32 -08:00
Android Git Automerger
20801d679f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-02-28 10:49:07 -08:00
Svetoslav Ganov
2891b9aaba am 0c96daa5: am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '0c96daa5d5a1ef778ad1ef4619ef1fa4c30519c6':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:41:42 -08:00
Svetoslav Ganov
c502f3b6de am c78f1217: am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit 'c78f121716ff7d4cbf8a70519a266ae030942751':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:39:17 -08:00
Svetoslav Ganov
c1a5853a7c am 0c7ffac4: am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '0c7ffac4caf413bd5fef2002079ec1d4bff2bc37':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:38:39 -08:00
Svetoslav Ganov
6948e13a34 am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:35:43 -08:00
Svetoslav Ganov
3191d487f7 am a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit 'a2b41b438d45570867e4682c0caaf93ace5e712e':
  NumberPicker showing IME when its input field  gains focus.
2012-02-28 10:35:18 -08:00
Jean-Baptiste Queru
c28371d138 Merge "Fixes update of extras Bundle in new Locations for GPS Provider" 2012-02-28 07:28:52 -08:00
Glenn Kasten
e82b06b4af Merge "Unlock effect chains in the middle of two if's" 2012-02-28 07:23:42 -08:00
Glenn Kasten
a0401c3384 Merge "Simplify removeNotificationClient" 2012-02-28 07:21:51 -08:00
Glenn Kasten
9f22baff2b Merge "AudioFlinger const methods and parameters" 2012-02-28 07:21:09 -08:00
Jean-Baptiste Queru
81ecdad03e am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
  stagefright amr: Avoid C++/C99 for loops with variable declaration
2012-02-28 07:19:40 -08:00
Jean-Baptiste Queru
6054e3e186 am d107453d: (-s ours) am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility"
* commit 'd107453ddf3af507e015ac641d5fb67ed513cd4b':
  Add stubs for better compatibility
2012-02-28 07:19:36 -08:00
Glenn Kasten
aea503952a Merge "Fix theoretical race condition in addOutputTrack" 2012-02-28 07:18:27 -08:00
Glenn Kasten
2f0b8f08ed Merge "AudioBufferProvider comments and cleanup" 2012-02-28 07:17:47 -08:00
Mathias Agopian
7a7524810a get rid of MemoryHeapPmem
MemoryHeapPmem is not used any longer. PMEM is not a supported
type of memory by the system anymore. a particular device might
use PMEM and need something like MemoryHeapPmem, in this case this
should be implemented in device specific code (HAL).

This will most likely break older no longer supported targets.

Change-Id: I434e4291219950018de8b793b0403bb2d92dd5cc
2012-02-27 19:58:57 -08:00