Marco Nelissen
4ab7abd796
Merge branch 'readonly-p4-master'
2009-04-20 12:49:56 -07:00
Marco Nelissen
760b67af39
AI 146964: tabs -> spaces
...
Automated import of CL 146964
2009-04-20 12:48:39 -07:00
Nick Pelly
40b304e574
Merge branch 'readonly-p4-master'
2009-04-02 10:31:50 -07:00
Nick Pelly
42781c76fc
AI 144205: am: CL 144151 am: CL 144150 Fix heap corruption.
...
Take mutex in close(), and skip write path after turning bluetooth off.
Original author: npelly
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 144205
2009-04-02 10:30:39 -07:00
The Android Open Source Project
bdf653f3a4
Merge commit 'goog/readonly-p4-master'
2009-03-31 21:34:25 -07:00
Eric Laurent
c828f6ae97
AI 143785: am: CL 143775 am: CL 143620 Attempt for fixing crash in AudioFlinger::MixerThread::dumpTracks() seen in bug report for issue 1747119.
...
AudioFlinger::MixerThread::dumpTracks() was reading mTracks[] vector instead of mActiveTracks[] when dumping active tracks.
Original author: elaurent
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143785
2009-03-31 14:34:35 -07:00
Eric Laurent
933a9418d9
AI 143327: am: CL 143177 am: CL 142889 Fix issue #1736153 Camera shutter sound can be muted by new AlarmClock setting.
...
Current implementation of Camera service plays the camera shutter sound over the ALARM stream so that it cannot be muted by silent mode in order to comply to some country specific requirement. A recent change made it possible for the user to mute the ALARM stream thus making this stream not suitable any more for the camera shutter sound.
The fix consists in creating a new stream type only accessible by native code and that cannot be muted and use it to play camera sounds.
Original author: elaurent
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143327
2009-03-27 18:18:46 -07:00
Mathias Agopian
253ed06781
AI 143321: am: CL 143172 am: CL 142875 [1732012] for some reason these files didn't go through in the preview check-in.
...
Original author: mathias
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143321
2009-03-27 18:12:49 -07:00
Mathias Agopian
c08731e756
AI 143320: am: CL 143171 am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor
...
Original author: mathias
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143320
2009-03-27 18:11:38 -07:00
Mathias Agopian
0d1318b974
AI 143309: am: CL 143160 am: CL 142856 new-new-new-new rotation animation. it may still change one more time.
...
Original author: mathias
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143309
2009-03-27 17:58:20 -07:00
The Android Open Source Project
06ee417bc5
Merge commit 'korg/cupcake'
...
Conflicts:
core/java/android/webkit/WebView.java
core/java/android/widget/TwoLineListItem.java
preloaded-classes
2009-03-27 15:38:40 -07:00
Eric Laurent
b1596ee235
Automated import from //branches/cupcake/...@142889,142889
2009-03-26 01:57:59 -07:00
Mathias Agopian
192f79fe71
Automated import from //branches/cupcake/...@142875,142875
2009-03-25 23:26:39 -07:00
Mathias Agopian
ceff6e1874
Automated import from //branches/cupcake/...@142873,142873
2009-03-25 23:18:56 -07:00
Mathias Agopian
262453cecb
Automated import from //branches/cupcake/...@142856,142856
2009-03-25 21:42:35 -07:00
Dianne Hackborn
c3aa00b29f
Automated import from //branches/master/...@142771,142771
2009-03-25 16:21:55 -07:00
Dianne Hackborn
11d93f968c
Automated import from //branches/cupcake/...@142663,142663
2009-03-25 15:32:28 -07:00
Mathias Agopian
7c143aab44
Automated import from //branches/master/...@142447,142447
2009-03-24 22:50:50 -07:00
Mathias Agopian
b535e58351
Automated import from //branches/master/...@142432,142432
2009-03-24 22:49:21 -07:00
Mathias Agopian
e74be0afd9
Automated import from //branches/master/...@141504,141504
2009-03-24 20:25:55 -07:00
Mathias Agopian
0348218e93
Automated import from //branches/cupcake/...@142445,142445
2009-03-24 19:43:24 -07:00
Mathias Agopian
2ed5f739eb
Automated import from //branches/cupcake/...@142427,142427
2009-03-24 19:41:37 -07:00
Mathias Agopian
7a7af5c866
Automated import from //branches/master/...@140808,140808
2009-03-24 18:34:16 -07:00
The Android Open Source Project
0c2bcbc6cc
auto import from //branches/cupcake_rel/...@141571
2009-03-19 23:08:54 -07:00
The Android Open Source Project
4f68be1a5b
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
732ca39b70
Merge commit 'remotes/korg/cupcake' into merge
...
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
The Android Open Source Project
ebad147e65
auto import from //branches/cupcake_rel/...@138607
2009-03-13 13:04:22 -07:00
The Android Open Source Project
bcef13b666
auto import from //branches/cupcake/...@137873
2009-03-11 12:11:56 -07:00
The Android Open Source Project
22f8defddc
auto import from //branches/cupcake/...@137197
2009-03-09 11:52:12 -07:00
The Android Open Source Project
9adf84a4b6
auto import from //depot/cupcake/@136594
2009-03-05 14:34:35 -08:00
The Android Open Source Project
edbf3b6af7
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
The Android Open Source Project
d5193d9394
auto import from //depot/cupcake/@135843
2009-03-03 18:28:45 -08:00
James E. Blair
6015dfc996
Fix issue #1324 : No audible call-waiting indication when in-call volume
...
is low
http://code.google.com/p/android/issues/detail?id=1324
Re-base the internally generated in-call audio volume so that it is
never muted, which is already the case for the hardware routed in-call
audio.
2009-03-03 16:24:40 -08:00
The Android Open Source Project
43aa2b1cbf
auto import from //depot/cupcake/@132589
2009-03-03 14:04:24 -08:00
The Android Open Source Project
0bb03408de
auto import from //depot/cupcake/@137055
2009-03-02 22:54:33 -08:00
Adrian Taylor
f18936cbf4
Fixing LayerScreenshot bitmap config value.
2009-03-02 12:11:47 -08:00
The Android Open Source Project
d2bd26d326
auto import from //branches/cupcake/...@132276
2009-02-19 10:57:31 -08:00
Rebecca Schultz Zavin
45fa004f64
Add getBufferCount API to Overlay objects
...
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2009-02-13 17:26:28 -08:00
Rebecca Schultz Zavin
360211f7fe
Need to dup file descriptor when reading from the binder for native handles
...
When reading a native handle that has passed through the binder,
the fds have to be duped to prevent them from getting closed when the binder
object is destructed.
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2009-02-13 16:34:38 -08:00
The Android Open Source Project
ac65e0b172
auto import from //branches/cupcake/...@131421
2009-02-13 12:57:50 -08:00
The Android Open Source Project
a6938bab1f
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:00 -08:00
Jean-Baptiste Queru
a837ba778f
Add missing <limits.h> include
...
This should fix the build for gcc 4.3.2
2009-01-26 12:11:20 -08:00
The Android Open Source Project
e41dd756db
auto import from //branches/cupcake/...@127436
2009-01-22 00:13:42 -08:00
The Android Open Source Project
5f78a48bb8
auto import from //branches/cupcake/...@127101
2009-01-20 14:03:58 -08:00
The Android Open Source Project
8a7a67538a
auto import from //branches/cupcake/...@126645
2009-01-15 16:12:10 -08:00
The Android Open Source Project
276293246e
auto import from //branches/cupcake/...@125939
2009-01-09 17:51:23 -08:00
The Android Open Source Project
e09fd9e819
Code drop from //branches/cupcake/...@124589
2008-12-17 18:05:43 -08:00
The Android Open Source Project
7c1b96a165
Initial Contribution
2008-10-21 07:00:00 -07:00