ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
53,506 Commits 2 Branches 0 Tags 54 MiB
Commit Graph

53506 Commits

Author SHA1 Message Date
Jeffrey Sharkey ff44d5515b Merge branch 'readonly-p4-master' 2009-04-02 08:56:44 -07:00
Tadashi Takaoka 83a1ccce5e Merge branch 'readonly-p4-master' 2009-04-02 08:54:08 -07:00
Grace Kloba ffd88c7aa8 Merge branch 'readonly-p4-master' 2009-04-02 08:51:31 -07:00
Nick Pelly 819aa237a5 AI 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/...

Automated import of CL 144151
 2009-04-02 01:21:13 -07:00
Nick Pelly cb5883ecc5 AI 144150: Fix heap corruption. 
Take mutex in close(), and skip write path after turning bluetooth off.
  BUG=1751710

Automated import of CL 144150
 2009-04-01 16:40:01 -07:00
The Android Open Source Project 9361be0bac Merge branch 'master' of git://android.git.kernel.org/platform/frameworks/base 2009-03-31 22:19:39 -07:00
The Android Open Source Project ccbc38a436 Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:26 -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 34c594bde9 AI 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/...

Automated import of CL 143775
 2009-03-31 14:33:34 -07:00
Eric Laurent 3c52588ca9 AI 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.
  BUG=1747119

Automated import of CL 143620
 2009-03-31 09:38:57 -07:00
The Android Open Source Project cd3c19ae15 Merge branch 'open_source' into google_internal 
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
 2009-03-29 08:55:27 -07:00
The Android Open Source Project 89e9285b2f Merge branch 'open_source_no_contributions' into google_internal 2009-03-29 08:55:10 -07:00
The Android Open Source Project f755365008 Merge commit 'goog/cupcake' 2009-03-27 18:48:32 -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
Eric Laurent cbcb00eb73 AI 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/...

Automated import of CL 143177
 2009-03-27 16:27:16 -07:00
Mathias Agopian 816c5e2314 AI 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/...

Automated import of CL 143172
 2009-03-27 16:13:24 -07:00
Mathias Agopian 24fd77d440 AI 143171: am: CL 142873 fix [1732012] Only show screen rotation animation when triggered by sensor 
Original author: mathias
  Merged from: //branches/cupcake/...

Automated import of CL 143171
 2009-03-27 16:10:37 -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
Mathias Agopian ecbeaa0cf1 AI 143160: am: CL 142856 new-new-new-new rotation animation. it may still change one more time. 
Original author: mathias
  Merged from: //branches/cupcake/...

Automated import of CL 143160
 2009-03-27 15:36:09 -07:00
The Android Open Source Project 556c28a2cd Merge commit 'korg/cupcake' 2009-03-27 15:31:11 -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 c1992a6f75 Automated import from //branches/donutburger/...@142727,142727 2009-03-25 17:24: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
Jack Palevich 749c63dbff Automated import from //branches/master/...@142578,142578 2009-03-25 15:12:17 -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
Jack Palevich 87d80228cc Automated import from //branches/donutburger/...@142484,142484 2009-03-24 22:48:26 -07:00
Mathias Agopian 74c770be33 Automated import from //branches/donutburger/...@142446,142446 2009-03-24 22:43:22 -07:00
Mathias Agopian 6219dd7d3a Automated import from //branches/donutburger/...@142430,142430 2009-03-24 22:42:15 -07:00
Andy McFadden 3d82f1cc86 Automated import from //branches/master/...@141993,141993 2009-03-24 21:20:43 -07:00
Andy McFadden 4442661817 Automated import from //branches/donutburger/...@141992,141992 2009-03-24 21:16:04 -07:00
Niko Catania 3302cebdd5 Automated import from //branches/master/...@141784,141784 2009-03-24 20:55:36 -07:00
Niko Catania c8f10f8374 Automated import from //branches/donutburger/...@141782,141782 2009-03-24 20:53:55 -07:00
Andreas Huber 715222bb03 Automated import from //branches/master/...@141712,141712 2009-03-24 20:48:51 -07:00
Andreas Huber a26e6060f3 Automated import from //branches/donutburger/...@141711,141711 2009-03-24 20:47:19 -07:00
Wu-cheng Li 7110bf708f Automated import from //branches/master/...@141615,141615 2009-03-24 20:39:31 -07:00
Wu-cheng Li aab44b8cca Automated import from //branches/donutburger/...@141614,141614 2009-03-24 20:39:09 -07:00
Jason Sams 6023a5c6b1 Automated import from //branches/master/...@141599,141599 2009-03-24 20:37:37 -07:00
Jason Sams 9e431ace32 Automated import from //branches/donutburger/...@141598,141598 2009-03-24 20:36:57 -07:00
Mathias Agopian e74be0afd9 Automated import from //branches/master/...@141504,141504 2009-03-24 20:25:55 -07:00
Mathias Agopian 3df5e433a2 Automated import from //branches/donutburger/...@141502,141502 2009-03-24 20:25:29 -07:00
Jason Sams 3cff302213 Automated import from //branches/master/...@141471,141471 2009-03-24 20:21:49 -07:00