Commit Graph

38903 Commits

Author SHA1 Message Date
Danica Chang
72a6b1c389 deleted android_bluetooth_ScoSocket.cpp from makefile
Change-Id: I40d107c9efa415de29977fa0998a746d9c24240e
2010-07-20 13:53:21 -07:00
Eric Laurent
240677ec68 resolved conflicts for merge of dd206093 to master
Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
2010-07-20 13:37:19 -07:00
Dan Egnor
fb1c0fe7fd Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 2010-07-20 13:23:09 -07:00
Danica Chang
eaeffac5fc Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp" 2010-07-20 12:47:45 -07:00
happydroid
74ba31ba26 Enables writing to USIM phonebook (fixes issue 8976).
Change-Id: I60c4e4fab58d13a83193492d828b0b519875c710
2010-07-20 21:42:37 +02:00
Nipun Kwatra
4cd8672662 Restart preview after each takePicture is done.
Preview is called when CAMERA_MSG_COMPRESSED_IMAGE is recieved by
dataCallback(). It needs to be started as a new thread so that the
callback can return, and the camera can know that takePicture() is
done.

Change-Id: I4d0febbc993aac43b37f9f4a824e9c7b8785f19e
2010-07-20 12:42:29 -07:00
Nipun Kwatra
97a2566395 Merge "Use software encoder for time lapse capture." 2010-07-20 12:33:11 -07:00
Adam Powell
7bb66f3245 Merge "Action bar context mode support for overflow, submenus" 2010-07-20 12:15:08 -07:00
Adam Powell
2c9c9fe806 Action bar context mode support for overflow, submenus
Change-Id: I951ae179698b08b6aba5b174b3d47f0cf847352e
2010-07-20 12:08:07 -07:00
Nipun Kwatra
077cba41c1 Use software encoder for time lapse capture.
Change-Id: I7f60eb1af95590c84b0cd98134f5a5a8963338dd
2010-07-20 11:37:17 -07:00
Dan Egnor
341ff13689 resolved conflicts for merge of 9bc4039a to gingerbread
Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
2010-07-20 11:30:17 -07:00
Eric Laurent
dd2060932a am 22a2d718: Merge "Audio policy manager changes for audio effects" into gingerbread
Merge commit '22a2d7186d015efcd648dff99500f8467463be82' into gingerbread-plus-aosp

* commit '22a2d7186d015efcd648dff99500f8467463be82':
  Audio policy manager changes for audio effects
2010-07-20 11:28:26 -07:00
Eric Laurent
22a2d7186d Merge "Audio policy manager changes for audio effects" into gingerbread 2010-07-20 11:25:35 -07:00
Jean-Baptiste Queru
f34a7fbbbe Merge "Shoud specify the Resource class instance as an argument of the method newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache' (additional changes for ID:15815) https://review.source.android.com/#change,15815" 2010-07-20 11:22:45 -07:00
Romain Guy
13d33472b2 Merge "replaced deprecated setButton Methods" 2010-07-20 11:11:20 -07:00
Nipun Kwatra
f91f2971a8 Merge "Adding support for timelapse capture using still camera's takepicture. Also moving entire implementation into a new class CameraSourceTimeLapse which inherits from CameraSource." 2010-07-20 11:04:49 -07:00
Alex Sakhartchouk
aee71b4ea1 Merge "Fixing potential buffer overrun errors." 2010-07-20 11:01:34 -07:00
Alex Sakhartchouk
1e37e875ef Fixing potential buffer overrun errors.
Change-Id: I77c43f0dd3a5d5a54465ff5d562f8e2b4d7fa3c3
2010-07-20 10:59:25 -07:00
Andreas Huber
0ef7da159d am ff45709f: am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly.
Merge commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe'

* commit 'ff45709fbd1f24de1cf75ce9ce9ac8694ff1abbe':
  Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
2010-07-20 10:46:12 -07:00
Andreas Huber
ff45709fbd am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly.
Merge commit 'cc14a8393b92cd1ed6cba74829396045605ab211' into gingerbread-plus-aosp

* commit 'cc14a8393b92cd1ed6cba74829396045605ab211':
  Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
2010-07-20 10:40:39 -07:00
Jean-Baptiste Queru
99a518ffab resolved conflicts for merge of ca48433a to master
Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990
2010-07-20 10:40:17 -07:00
Jason Parks
94b916da2c Only print out wake locks in the if the wakelock was held.
Change-Id: I742121b70bd0e56ca2efe05fffa9fe3e4ad7b619
2010-07-20 12:39:07 -05:00
The Android Open Source Project
ca48433afc merge from open-source master
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
2010-07-20 10:33:38 -07:00
Eric Laurent
8ed6ed0b62 Audio policy manager changes for audio effects
Added methods for audio effects management by audio policy manager.
- control of total CPU load and memory used by effect engines
- selection of output stream for global effects
- added audio session id in parameter list for startOutput() and stopOutput().
this is not used in default audio policy manager implementation.

Modifications of audio effect framework in AudioFlinger to allow moving and reconfiguring
effect engines from one output mixer thread to another when audio tracks in the same session
are moved or when requested by audio policy manager.
Also fixed mutex deadlock problem with effect chains locks.

Change-Id: Ida43484b06e9b890d6b9e53c13958d042720ebdb
2010-07-20 10:31:57 -07:00
Vasu Nori
7b04c4176d make disableWriteAheadLogging method public so apps can disable WAL
music2 app has the weird situation where it embeds the jumper C++ code
and that code uses its own version of sqlite.
so, java side may want to disable WAL to make c++ code work well with java
usage of sqlite.
since WAL is made default option for all apps, this CL makes it possible for
music2 app to disable WAL.

Change-Id: I39ddbc9b4648f12b206ff3e76d30341da5955bd4
2010-07-20 10:31:21 -07:00
The Android Open Source Project
bd7599ff0c am fcff6910: merge from open-source master
Merge commit 'fcff691057fecdedd6d3033da672d1a473c76066'

* commit 'fcff691057fecdedd6d3033da672d1a473c76066':
  typo fixed
2010-07-20 10:28:35 -07:00
Scott Main
2316d62608 docs: add information about using color resources as drawables
Change-Id: I24d82292b700104294d268894b660bc8b7e5ddb0
2010-07-20 10:28:09 -07:00
The Android Open Source Project
fcff691057 merge from open-source master
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
2010-07-20 10:25:37 -07:00
Dan Egnor
b3e4ef3702 COMMENT ONLY change to add some warnings about ParcelFileDescriptor
behavior with Parcel.writeValue().

Change-Id: If55fcce29559379855735ff5297cf4f46d5d6be6
Bug: 2847738
2010-07-20 10:24:38 -07:00
Chet Haase
358af100ed Merge "Fix bugs in Sequencer" 2010-07-20 10:07:53 -07:00
Andreas Huber
3f15301c06 am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f'

* commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f':
  Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
2010-07-20 09:33:09 -07:00
Andreas Huber
cc14a8393b Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
related-to-bug: 2826841
2010-07-20 09:25:38 -07:00
Andreas Huber
4df3ab54eb am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Merge commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp

* commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
  Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
2010-07-20 09:24:53 -07:00
Andreas Huber
faf1d46a60 Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread 2010-07-20 09:18:58 -07:00
Mike Lockwood
30881f68c9 Merge "MTP host fixes:" 2010-07-20 09:06:41 -07:00
Mike Lockwood
3c51d6a9ef MTP host fixes:
Add support for detecting android MTP devices
Fix problem reading data packet with header sent separately from payload.

Change-Id: I07b34af6783ebe2e63a317796ba0c8223df86edf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-20 12:01:36 -04:00
James Dong
85edea7958 Progress status notification
- Keep track of per-track progress

Change-Id: Ibd36f0e8c78581928c8aa2f5e23c5e7e0615c2cc
2010-07-20 08:39:57 -07:00
Andy McFadden
aecf390618 Fix sim-eng build.
The LOCAL_PATH assignment was not available to the new host library
on simulator builds.

Change-Id: I7727f17ecc8f457f92bd6fa9ec13025dd8a56390
2010-07-20 08:18:43 -07:00
Masanori Ogino
708654c0b8 Shoud specify the Resource class instance as an argument of the method
newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache'
(additional changes for ID:15815)
https://review.source.android.com/#change,15815

Change-Id: I6bf19b8e6e187df8c8e3cb57d9e04278ddfe5055
2010-07-20 23:32:19 +09:00
Mike Lockwood
108505b30f MTP: Remove race condition in initial device enumeration for host mode.
Change-Id: Iee01aaae3f8cca4234daa289bef6631da4d6c2b6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-20 09:49:50 -04:00
Mike Lockwood
9bbc2ea9ad MTP: Fix problems reading and writing arrays in property values.
Change-Id: Idd53b63fd32698a3ffc90f174d16ae597b4feb36
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-20 09:49:50 -04:00
Mike Lockwood
bbd9f36efa MTP: add Linux host library for MTP/PTP host support.
Change-Id: Ie2ce60b957ee428a8e8db46a70c5a0ade8445007
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-20 09:49:50 -04:00
Shih-wei Liao
b1cd67bb48 Merge "Fix Android build" 2010-07-20 01:26:34 -07:00
Shih-wei Liao
57e7a95b16 Fix Android build
Change-Id: I531dec556e6774518d19707f91c99ecaaf344c0f
2010-07-20 01:25:10 -07:00
Shih-wei Liao
9d07ed1f5d Merge "Change the include path." 2010-07-20 01:04:58 -07:00
Shih-wei Liao
7152c05724 Change the include path.
Change-Id: I884f95e40ab2d7080fd1eec0ecc9b86794b7c042
2010-07-20 01:03:09 -07:00
Shih-wei Liao
c67dc1afba Merge "Port ModelViewer to use the new build system. Fix the simulator build on Fountain." 2010-07-20 00:37:42 -07:00
Shih-wei Liao
3485976e84 Port ModelViewer to use the new build system.
Fix the simulator build on Fountain.

Change-Id: I89b05c31595f0a8c3001171957eeeb2fec253c74
2010-07-20 00:36:47 -07:00
Christian Mehlmauer
7664e20927 replaced deprecated setButton Methods
Change-Id: I8361377cda18ae060a53b84702a2cf9b6f3e8365
2010-07-20 08:46:17 +02:00
Ying Wang
6ddaacef9b Switch back to use the default search of include path
since slang has been fixed to add current dir as one of the default search path.

Change-Id: Id3e80955ce445f155fc518927974be7986daff1f
2010-07-19 19:05:31 -07:00