summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge changes I2337051b,I19b426cb into gingerbreadKenny Root2010-07-122-17/+36
|\ | | | | | | | | | | * changes: Tweak ObbFile class Allow things that can install packages to set Obb paths
| * Tweak ObbFile classKenny Root2010-07-122-17/+36
| | | | | | | | | | | | | | | | | | | | | | * Move error messages around to clarify the errors. * Add extra error check when reading a file. * Seek to the end of a file when writing the signature so the users of the API don't have to remember to do it. Change-Id: I2337051b9f9fa8147c5900237deec790dcd92436
* | Add ANativeWindow API for directly drawing to the surface bits.Dianne Hackborn2010-07-092-22/+19
| | | | | | | | | | | | | | | | | | | | | | Also other cleanup and fixes: - We now properly set the default window format to 565. - New APIs to set the window format and flags from native code. - Tweaked glue for simpler handling of the "destroy" message. - Um, other stuff. Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
* | Merge "Remove some (unused, non-public) phone-related status bar ↵David Brown2010-07-090-0/+0
|\ \ | | | | | | | | | notification icons" into gingerbread
* \ \ Merge "Fix swap of sessionId and output in audio effect API." into gingerbreadJean-Michel Trivi2010-07-090-0/+0
|\ \ \
* \ \ \ Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" ↵James Dong2010-07-090-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | into gingerbread
* | | | Merge "Make android:immersive public." into gingerbreadDaniel Sandler2010-07-090-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
* | | Merge "Improve InstrumentationTestRunner exception handling." into gingerbreadBrett Chabot2010-07-080-0/+0
|\ \ \ | | |/ | |/|
* | | Merge "Add new glue code for writing native apps." into gingerbreadDianne Hackborn2010-07-084-81/+134
|\ \ \
| * | | Add new glue code for writing native apps.Dianne Hackborn2010-07-084-81/+134
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This factors out the boiler-plate code from the sample app to a common glue code that can be used for everyone writing this style of app: a dedicated app thread that takes care of waiting for events and processing them. As part of doing this, ALooper has a new facility to allow registration of fds that cause ALooper_pollOnce() to return the fd that has data, allowing the app to drive the loop without callbacks. Hopefully this makes some people feel better. :) Also do some other cleanup of the ALooper API, plus some actual documentation. Change-Id: Ic53bd56bdf627e3ba28a3c093faa06a92be522b8
* | | Merge "Change CursorTreeAdapter to close the cursors rather than ↵Jason Parks2010-07-080-0/+0
|\ \ \ | |/ / | | | | | | deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread
* | | am 286cf139: docs: add redirect for download.htmlScott Main2010-07-080-0/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Merge commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62' into gingerbread * commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62': docs: add redirect for download.html
* | | Merge "Remove voice mail number verification for testing on no-sim device" ↵Xia Wang2010-07-070-0/+0
|\ \ \ | | |/ | |/| | | | into gingerbread
* | | am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyoScott Main2010-07-070-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8' into gingerbread * commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8': docs: add caution about adt in eclipse 3.6
| * | Merge "docs: add caution about adt in eclipse 3.6" into froyoScott Main2010-07-070-0/+0
| |\ \
* | \ \ Merge "OBB API for PackageManager" into gingerbreadKenny Root2010-07-070-0/+0
|\ \ \ \
* \ \ \ \ Merge "Add OBB file helper class" into gingerbreadKenny Root2010-07-075-0/+453
|\ \ \ \ \ | |/ / / /
| * | | | Add OBB file helper classKenny Root2010-07-075-0/+453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ObbFile is a binary blob that will be used in packaging large files with smaller APKs. Change-Id: Ib1594346cfa2f49113de6565af77c24efbd89d63
* | | | | Merge "More native input dispatch work." into gingerbreadChris Tate2010-07-073-61/+89
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | More native input dispatch work.Jeff Brown2010-07-033-61/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed old input dispatch code. Refactored the policy callbacks. Pushed a tiny bit of the power manager state down to native. Fixed long press on MENU. Made the virtual key detection and cancelation a bit more precise. Change-Id: I5d8c1062f7ea0ab3b54c6fadb058c4d5f5a9e02e
* | | | | Merge "Added Visualizer effect." into gingerbreadEric Laurent2010-07-072-13/+33
|\ \ \ \ \
| * | | | | Added Visualizer effect.Eric Laurent2010-07-072-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android ↵Dirk Dougherty2010-07-070-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Merge "Doc change: Add revision notes for Android 2.2_r2 development ↵Dirk Dougherty2010-07-070-0/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | platform. Fix some umappable characters in WebView class doc." into froyo
* | | | | | Merge "Allow application to set two more encoding paramters: video profile ↵James Dong2010-07-070-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | and level" into gingerbread
* | | | | | Merge "Fix some bugs in the MediaProfileReader Because the video and audio ↵James Dong2010-07-070-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread
* | | | | | Merge "Only send the playback complete notification if a) an error occurred ↵Andreas Huber2010-07-070-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | 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 "More improvements to the SensorManager documentation" into gingerbreadMathias Agopian2010-07-070-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge "ALooperRoster no longer holds strong references to handlers and ↵Andreas Huber2010-07-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | loopers." into gingerbread
* | | | | | Merge "An AHandler can now find its associated ALooper." into gingerbreadAndreas Huber2010-07-070-0/+0
|\ \ \ \ \ \
* | | | | | | Add new native Looper API.Dianne Hackborn2010-07-023-5/+102
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Fix a bug that prevented the creation of EGL shared contexts." into ↵Mathias Agopian2010-07-021-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gingerbread
| * | | | | | Fix a bug that prevented the creation of EGL shared contexts.Jamie Gennis2010-07-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
* | | | | | | am 1c8b6ca4: docs: fix misc broken linksScott Main2010-07-020-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1c8b6ca4d7dd7c8263d5224de6e814681a14afa5' into gingerbread * commit '1c8b6ca4d7dd7c8263d5224de6e814681a14afa5': docs: fix misc broken links
* | | | | | | Merge "Add an option to ALooper::start that allows it to call back into java ↵Andreas Huber2010-07-020-0/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | or not." into gingerbread
* | | | | | | Merge "Added AMessage::debugString() for debugging purposes." into gingerbreadAndreas Huber2010-07-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
* | | | | | | am 7df74471: Merge "Flush binder buffer after setting raw heap to avoid ↵Chih-Chung Chang2010-07-021-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leaking a reference." into froyo Merge commit '7df7447112371fb5e46f6084b55ac2ccdfde139d' into gingerbread * commit '7df7447112371fb5e46f6084b55ac2ccdfde139d': Flush binder buffer after setting raw heap to avoid leaking a reference.
| * | | | | | Merge "Flush binder buffer after setting raw heap to avoid leaking a ↵Chih-Chung Chang2010-07-021-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | reference." into froyo
| | * | | | | | Flush binder buffer after setting raw heap to avoid leaking a reference.Chih-Chung Chang2010-07-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am f80372db: Merge "docs: update device dashboard; add historical chart" ↵Scott Main2010-07-010-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit 'f80372dbc0f4a1b80bebfe5f5124de8d31e0996b' into gingerbread * commit 'f80372dbc0f4a1b80bebfe5f5124de8d31e0996b': docs: update device dashboard; add historical chart
| * | | | | | Merge "docs: update device dashboard; add historical chart" into froyoScott Main2010-07-010-0/+0
| | | | | | |
* | | | | | | Merge "remove unused YUV formats" into gingerbreadMathias Agopian2010-07-012-18/+24
|\ \ \ \ \ \ \
| * | | | | | | remove unused YUV formatsMathias Agopian2010-07-012-18/+24
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: Ie84616f842c7e0329d68e67e65a65d510558004b
* | | | | | | Merge "Log full exception when failing to inflate notification view" into ↵Steve Howard2010-07-010-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
* \ \ \ \ \ \ \ am c03befe3: Fix issue 2811538: System server crash when disconnecting BT ↵Eric Laurent2010-07-010-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbreadJames Dong2010-07-010-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | Merge "DO NOT MERGE: Add a battery capacity value to the power profile." ↵Amith Yamasani2010-07-010-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
* | | | | | | | Merge "Fix issue 2811538: System server crash when disconnecting BT headset ↵Eric Laurent2010-07-010-0/+0
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | after using SCO off call." into gingerbread
* | | | | | | Merge "Introduce official public NativeWindow type." into gingerbreadDianne Hackborn2010-06-307-77/+82
|\ \ \ \ \ \ \
| * | | | | | | Introduce official public NativeWindow type.Dianne Hackborn2010-06-307-77/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not yet hooked up to anything in the NDK, but requires renaming the existing android_native_window_t type everywhere. Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e