The Android Open Source Project
caee1703fe
Merge commit 'goog/readonly-p4-master'
2009-03-31 21:34:25 -07:00
Eric Laurent
d3b4d0cfc1
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
63e45f2854
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
d97bbd8871
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
eb0c86e18b
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
3552f53c83
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
e1861133d5
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
eeea922213
Automated import from //branches/cupcake/...@142889,142889
2009-03-26 01:57:59 -07:00
Mathias Agopian
3a186c7c2e
Automated import from //branches/cupcake/...@142875,142875
2009-03-25 23:26:39 -07:00
Mathias Agopian
c75c4364ea
Automated import from //branches/cupcake/...@142873,142873
2009-03-25 23:18:56 -07:00
Mathias Agopian
d2f34e5fd6
Automated import from //branches/cupcake/...@142856,142856
2009-03-25 21:42:35 -07:00
Dianne Hackborn
4e829f0aca
Automated import from //branches/master/...@142771,142771
2009-03-25 16:21:55 -07:00
Dianne Hackborn
19f06fefc0
Automated import from //branches/cupcake/...@142663,142663
2009-03-25 15:32:28 -07:00
Mathias Agopian
afbf448b7d
Automated import from //branches/master/...@142447,142447
2009-03-24 22:50:50 -07:00
Mathias Agopian
1379665abd
Automated import from //branches/master/...@142432,142432
2009-03-24 22:49:21 -07:00
Mathias Agopian
013456784a
Automated import from //branches/master/...@141504,141504
2009-03-24 20:25:55 -07:00
Mathias Agopian
e94fa1ba1d
Automated import from //branches/cupcake/...@142445,142445
2009-03-24 19:43:24 -07:00
Mathias Agopian
ec4faffff3
Automated import from //branches/cupcake/...@142427,142427
2009-03-24 19:41:37 -07:00
Mathias Agopian
b2cf954cb4
Automated import from //branches/master/...@140808,140808
2009-03-24 18:34:16 -07:00
The Android Open Source Project
c2ad241504
auto import from //branches/cupcake_rel/...@141571
2009-03-19 23:08:54 -07:00
The Android Open Source Project
105925376f
auto import from //branches/cupcake_rel/...@140373
2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
2a73de7b21
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
ba87e3e6c9
auto import from //branches/cupcake_rel/...@138607
2009-03-13 13:04:22 -07:00
The Android Open Source Project
c39a6e0c51
auto import from //branches/cupcake/...@137873
2009-03-11 12:11:56 -07:00
The Android Open Source Project
b2a3dd88a5
auto import from //branches/cupcake/...@137197
2009-03-09 11:52:12 -07:00
The Android Open Source Project
4df2423a94
auto import from //depot/cupcake/@136594
2009-03-05 14:34:35 -08:00
The Android Open Source Project
9066cfe988
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce
auto import from //depot/cupcake/@135843
2009-03-03 18:28:45 -08:00
James E. Blair
90329a69f8
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
076357b856
auto import from //depot/cupcake/@132589
2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a
auto import from //depot/cupcake/@137055
2009-03-02 22:54:33 -08:00
Adrian Taylor
efd826e911
Fixing LayerScreenshot bitmap config value.
2009-03-02 12:11:47 -08:00
The Android Open Source Project
3001a03543
auto import from //branches/cupcake/...@132276
2009-02-19 10:57:31 -08:00
Rebecca Schultz Zavin
31d459d81a
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
bc4afde167
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
da996f390e
auto import from //branches/cupcake/...@131421
2009-02-13 12:57:50 -08:00
The Android Open Source Project
d24b8183b9
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:00 -08:00
Jean-Baptiste Queru
2076373275
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
f1e484acb5
auto import from //branches/cupcake/...@127436
2009-01-22 00:13:42 -08:00
The Android Open Source Project
22f7dfd234
auto import from //branches/cupcake/...@127101
2009-01-20 14:03:58 -08:00
The Android Open Source Project
9266c558bf
auto import from //branches/cupcake/...@126645
2009-01-15 16:12:10 -08:00
The Android Open Source Project
b798689749
auto import from //branches/cupcake/...@125939
2009-01-09 17:51:23 -08:00
The Android Open Source Project
f013e1afd1
Code drop from //branches/cupcake/...@124589
2008-12-17 18:05:43 -08:00
The Android Open Source Project
54b6cfa9a9
Initial Contribution
2008-10-21 07:00:00 -07:00