Commit Graph

16581 Commits

Author SHA1 Message Date
Eric Laurent
37369af6a3 am dacabf97: Merge "Added Visualizer effect." into gingerbread
Merge commit 'dacabf97c609a040ada857a7da6c560097448ae3' into gingerbread-plus-aosp

* commit 'dacabf97c609a040ada857a7da6c560097448ae3':
  Added Visualizer effect.
2010-07-07 16:34:57 -07:00
Eric Laurent
b687191959 Merge "Added Visualizer effect." into gingerbread 2010-07-07 16:23:30 -07:00
Dirk Dougherty
d06d818ef6 am 4b9baa69: am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Merge commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5' into gingerbread-plus-aosp

* commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
2010-07-07 15:08:59 -07:00
Dirk Dougherty
d7750ebcb5 am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Merge commit '2651504c020f07847bafa3d539c36f1396629669' into gingerbread

* commit '2651504c020f07847bafa3d539c36f1396629669':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
2010-07-07 15:06:35 -07:00
James Dong
a3a757588c am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread
Merge commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8' into gingerbread-plus-aosp

* commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8':
  Allow application to set two more encoding paramters: video profile and level
2010-07-07 14:58:30 -07:00
James Dong
06c6175475 am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread
Merge commit '58c35573cc677b736efefa267eba8727d4411999' into gingerbread-plus-aosp

* commit '58c35573cc677b736efefa267eba8727d4411999':
  Fix some bugs in the MediaProfileReader
2010-07-07 14:58:26 -07:00
James Dong
c54a252c75 Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread 2010-07-07 14:56:33 -07:00
James Dong
64b99bd495 Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread 2010-07-07 14:56:20 -07:00
Dirk Dougherty
90dc86d7e0 Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo 2010-07-07 14:29:29 -07:00
Andreas Huber
2801326cd3 am c34c8c3f: Merge "Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing." into gingerbread
Merge commit 'c34c8c3fe7fef15b410b0544d5436fcbefccd610' into gingerbread-plus-aosp

* commit 'c34c8c3fe7fef15b410b0544d5436fcbefccd610':
  Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.
2010-07-07 14:22:39 -07:00
Andreas Huber
3effe3dfc1 Merge "Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing." into gingerbread 2010-07-07 14:20:15 -07:00
Mathias Agopian
ac825e445b am ef52b568: Merge "More improvements to the SensorManager documentation" into gingerbread
Merge commit 'ef52b5682d8c6ab3a384da5151f0e4dd6e9a5506' into gingerbread-plus-aosp

* commit 'ef52b5682d8c6ab3a384da5151f0e4dd6e9a5506':
  More improvements to the SensorManager documentation
2010-07-07 13:09:07 -07:00
Mathias Agopian
6c9b6b6664 Merge "More improvements to the SensorManager documentation" into gingerbread 2010-07-07 13:06:57 -07:00
Daniel Sandler
26f14429b2 am b59b9445: Fix icon size in intruder alerts.
Merge commit 'b59b94456b3a8fdfdf524a81274839f657fbb65b' into gingerbread-plus-aosp

* commit 'b59b94456b3a8fdfdf524a81274839f657fbb65b':
  Fix icon size in intruder alerts.
2010-07-07 11:09:57 -07:00
Eric Laurent
873f21c820 Added Visualizer effect.
The visualizer enables application to retrieve part of the currently playing audio for visualization purpose.
It is not an audio recording interface and only returns partial and low quality audio content as a waveform or
a frequency representation (FFT).

Removed temporary hack made in MediaPlayer for animated wall papers based on audio visualization (snoop() method.

This commit also includes a change in AudioEffect class:
 - the enable()/disable() methods have been replaced bya more standard setEnabled() method.
 - some fixes in javadoc

Change-Id: Id092a1340e9e38dae68646ade7be054e3a36980e
2010-07-07 11:00:28 -07:00
Andreas Huber
e4ecf0c449 am 2e6aff8e: Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread
Merge commit '2e6aff8e19ce8292a36fe211f8051dccf1fb9670' into gingerbread-plus-aosp

* commit '2e6aff8e19ce8292a36fe211f8051dccf1fb9670':
  ALooperRoster no longer holds strong references to handlers and loopers.
2010-07-07 09:42:59 -07:00
Andreas Huber
2f1276dd22 Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread 2010-07-07 09:41:05 -07:00
Andreas Huber
4249e205cc am 6615defd: Make sure the OMX callback thread is properly shutdown after the node goes away.
Merge commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd' into gingerbread-plus-aosp

* commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd':
  Make sure the OMX callback thread is properly shutdown after the node goes away.
2010-07-07 09:40:58 -07:00
Andreas Huber
b1659c7706 am 9406f626: Merge "An AHandler can now find its associated ALooper." into gingerbread
Merge commit '9406f626b2d8f64a084d41f6ea379e539b162a55' into gingerbread-plus-aosp

* commit '9406f626b2d8f64a084d41f6ea379e539b162a55':
  An AHandler can now find its associated ALooper.
2010-07-07 09:04:26 -07:00
Dianne Hackborn
58eab5f3c4 am 68267415: Add new native Looper API.
Merge commit '682674154e3fe88f6061245145f934f25f1a2eb8' into gingerbread-plus-aosp

* commit '682674154e3fe88f6061245145f934f25f1a2eb8':
  Add new native Looper API.
2010-07-07 09:04:19 -07:00
Andreas Huber
e6aa91f6ed Merge "An AHandler can now find its associated ALooper." into gingerbread 2010-07-07 06:57:27 -07:00
Dianne Hackborn
efa1085066 Add new native Looper API.
This allows us to avoid exposing the file descriptor of
the event queue; instead, you attach an event queue to
a looper.  This will also should allow native apps to be
written without the need for a separate thread, by attaching
the event queue to the main thread's looper and scheduling
their own messages there.

Change-Id: I38489282635895ae2cbfacb88599c1b1cad9b239
2010-07-02 18:57:02 -07:00
Mathias Agopian
7c1c974d79 am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread
Merge commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d' into gingerbread-plus-aosp

* commit '8ecfb60a8e74dfcd51bbf3f236d5f414a4d5ac7d':
  Fix a bug that prevented the creation of EGL shared contexts.
2010-07-02 12:34:22 -07:00
Mathias Agopian
bf83375c73 Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread 2010-07-02 12:32:33 -07:00
Scott Main
a2a763164f am 125204b7: am 1c8b6ca4: docs: fix misc broken links
Merge commit '125204b737deaaa7719f25d680e96b694c2b8de6' into gingerbread-plus-aosp

* commit '125204b737deaaa7719f25d680e96b694c2b8de6':
  docs: fix misc broken links
2010-07-02 12:16:07 -07:00
Scott Main
1b0d2023c3 am 1c8b6ca4: docs: fix misc broken links
Merge commit '1c8b6ca4d7dd7c8263d5224de6e814681a14afa5' into gingerbread

* commit '1c8b6ca4d7dd7c8263d5224de6e814681a14afa5':
  docs: fix misc broken links
2010-07-02 12:12:56 -07:00
Jamie Gennis
4c39f8f9e2 Fix a bug that prevented the creation of EGL shared contexts.
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
2010-07-02 12:05:07 -07:00
Andreas Huber
04e2f33acd am 2cfd8198: Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread
Merge commit '2cfd8198cc4e1dcdcae52ae8a0c86b871c87a27e' into gingerbread-plus-aosp

* commit '2cfd8198cc4e1dcdcae52ae8a0c86b871c87a27e':
  Add an option to ALooper::start that allows it to call back into java or not.
2010-07-02 10:04:08 -07:00
Andreas Huber
550892cf23 Merge "Add an option to ALooper::start that allows it to call back into java or not." into gingerbread 2010-07-02 10:02:17 -07:00
Andreas Huber
693aa3d961 am 5460d126: Merge "Added AMessage::debugString() for debugging purposes." into gingerbread
Merge commit '5460d126f024a8d6597ce4eb127b51c101724960' into gingerbread-plus-aosp

* commit '5460d126f024a8d6597ce4eb127b51c101724960':
  Added AMessage::debugString() for debugging purposes.
2010-07-02 08:03:20 -07:00
Andreas Huber
a759547c76 Merge "Added AMessage::debugString() for debugging purposes." into gingerbread 2010-07-02 08:00:30 -07:00
Chih-Chung Chang
44365c5622 am 3ef6ebe8: am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Merge commit '3ef6ebe874022c4ec8fbb00067833a6f636c1e2f' into gingerbread-plus-aosp

* commit '3ef6ebe874022c4ec8fbb00067833a6f636c1e2f':
  Flush binder buffer after setting raw heap to avoid leaking a reference.
2010-07-02 07:50:26 -07:00
Chih-Chung Chang
ac2a934aae am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Merge commit '7df7447112371fb5e46f6084b55ac2ccdfde139d' into gingerbread

* commit '7df7447112371fb5e46f6084b55ac2ccdfde139d':
  Flush binder buffer after setting raw heap to avoid leaking a reference.
2010-07-02 07:48:03 -07:00
Chih-Chung Chang
4e459e7676 Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo 2010-07-02 07:43:31 -07:00
The Android Open Source Project
3541b20f6f merge from open-source master
Change-Id: Ifec16490ea2170728cb6ccb18d2e74fcb3478db6
2010-07-02 07:38:30 -07:00
Scott Main
caeee7275c am 43d9b0ae: am f80372db: Merge "docs: update device dashboard; add historical chart" into froyo
Merge commit '43d9b0aeb891e10fdb2bd797d0d4c4417abf3bdb' into gingerbread-plus-aosp

* commit '43d9b0aeb891e10fdb2bd797d0d4c4417abf3bdb':
  docs: update device dashboard; add historical chart
2010-07-01 23:35:57 -07:00
Scott Main
925a9abb6d am f80372db: Merge "docs: update device dashboard; add historical chart" into froyo
Merge commit 'f80372dbc0f4a1b80bebfe5f5124de8d31e0996b' into gingerbread

* commit 'f80372dbc0f4a1b80bebfe5f5124de8d31e0996b':
  docs: update device dashboard; add historical chart
2010-07-01 23:33:20 -07:00
Scott Main
60a1589654 Merge "docs: update device dashboard; add historical chart" into froyo 2010-07-01 23:26:58 -07:00
Chih-Chung Chang
b6aef253f4 Flush binder buffer after setting raw heap to avoid leaking a reference.
The problem was:

1. In handleShutter(), thread A in CameraService calls
   registerBuffers(IMemoryHeap) and it's received by thread B
   in system_server. [transaction 1]
2. While thread A is waiting for the reply, thread B calls
   back to thread A to get the id of the heap
   (IMemoryHeap.getHeapID). [transaction 2]
3. Thread A replies transaction 2 and is preemptied in kernel.
   Thread B gets the reply and finishes registerBuffers and send
   reply for transaction 1.
4. When thread A runs again, it gets the reply for transaction 1
   and returns to handleShutter().
5. At this point the transaction buffer for transaction 2 (which
   holds a reference to IMemoryHeap) is not freed because the
   BC_FREE_BUFFER command is kept in thread A's local command
   queue and not sent to the kernel.
6. Normally when thread A makes next transaction, the
   BC_FREE_BUFFER command will be sent together (piggyback) with
   the commands for that transaction. But in this case thread A
   is a callback thread from camera driver, so it does not make
   any binder calls afterwards, and the IMemoryHeap is never freed
   (until the next time handleShutter is called).

Change-Id: I435a258187509bdbbaf353339eb9ea577610cbd2
2010-07-02 12:56:54 +08:00
Mathias Agopian
3d5d05ab58 am 7f8edbd9: Merge "remove unused YUV formats" into gingerbread
Merge commit '7f8edbd92737bc610bf4f06ad8a516656be83188' into gingerbread-plus-aosp

* commit '7f8edbd92737bc610bf4f06ad8a516656be83188':
  remove unused YUV formats
2010-07-01 21:31:31 -07:00
Mathias Agopian
1632de8aa4 Merge "remove unused YUV formats" into gingerbread 2010-07-01 21:28:24 -07:00
Mathias Agopian
1764c73b55 remove unused YUV formats
Change-Id: Ie84616f842c7e0329d68e67e65a65d510558004b
2010-07-01 21:17:56 -07:00
Steve Howard
fb3e4a1367 am 6ffd9ff0: Merge "Log full exception when failing to inflate notification view" into gingerbread
Merge commit '6ffd9ff07733a855daeda75416cea88e7456e9d6' into gingerbread-plus-aosp

* commit '6ffd9ff07733a855daeda75416cea88e7456e9d6':
  Log full exception when failing to inflate notification view
2010-07-01 19:41:12 -07:00
Steve Howard
74253bae41 Merge "Log full exception when failing to inflate notification view" into gingerbread 2010-07-01 19:38:48 -07:00
Dianne Hackborn
f0df01ce96 am 8ae5a8e7: Get to the point of being able to do native drawing.
Merge commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb' into gingerbread-plus-aosp

* commit '8ae5a8e7c04c7b204b739dfcd5da9e2e0f83e1eb':
  Get to the point of being able to do native drawing.
2010-07-01 19:25:01 -07:00
Eric Laurent
1856a5c349 am f520411a: am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit 'f520411a35db5248934a4b50859ca72e3f865593' into gingerbread-plus-aosp

* commit 'f520411a35db5248934a4b50859ca72e3f865593':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:38:33 -07:00
Eric Laurent
44c72e307d am c03befe3: Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Merge commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd' into gingerbread

* commit 'c03befe3d62eb2a3e1d56fec0ca188a6094d53dd':
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
2010-07-01 16:36:02 -07:00
Dianne Hackborn
5ff2853bdf am 54a181b1: Make real API for native code to get its window.
Merge commit '54a181b1a2b1517a9479b21fbf7705a688232faf' into gingerbread-plus-aosp

* commit '54a181b1a2b1517a9479b21fbf7705a688232faf':
  Make real API for native code to get its window.
2010-07-01 16:00:19 -07:00
James Dong
4a9c2b66cc am 65c83b90: Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
Merge commit '65c83b906d01c3c1493d0547757dbb16d4c3722a' into gingerbread-plus-aosp

* commit '65c83b906d01c3c1493d0547757dbb16d4c3722a':
  Refactor Stagefright::StartMPEG4Recording()
2010-07-01 14:12:47 -07:00
James Dong
61f7aba45b Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread 2010-07-01 14:11:01 -07:00