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

141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ray Chen
f002e92432 Merge branch 'readonly-p4-master' 2009-04-02 10:43:05 -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
Chris Tate
6d197e1e51 Merge branch 'readonly-p4-master' 2009-04-02 10:16:05 -07:00
Jack Palevich
fb22e79358 Merge branch 'readonly-p4-master' 2009-04-02 10:10:59 -07:00
Brett Chabot
a72b4bdaab Merge branch 'readonly-p4-master' 2009-04-02 09:57:46 -07:00
Eric Laurent
fb677c2561 Merge branch 'readonly-p4-master' 2009-04-02 09:33:55 -07:00
Doug Zongker
2889271216 Merge branch 'readonly-p4-master' 2009-04-02 09:25:56 -07:00
Romain Guy
147610c8f6 Merge branch 'readonly-p4-master' 2009-04-02 09:20:36 -07:00
Bjorn Bringert
d45ff52ecc Merge branch 'readonly-p4-master' 2009-04-02 09:17:54 -07:00
Mike Reed
c81fad4a92 Merge branch 'readonly-p4-master' 2009-04-02 09:07:27 -07:00
Romain Guy
efd9fb994e Merge branch 'readonly-p4-master' 2009-04-02 09:04:51 -07:00
Bjorn Bringert
175e9d9ff2 Merge branch 'readonly-p4-master' 2009-04-02 09:02:11 -07:00
Jean-Baptiste Queru
19d8b99c9d Merge branch 'readonly-p4-master' 2009-04-02 08:59:23 -07:00
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
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
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
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
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
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
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
Andy McFadden
3d82f1cc86 Automated import from //branches/master/...@141993,141993 2009-03-24 21:20:43 -07:00
Niko Catania
3302cebdd5 Automated import from //branches/master/...@141784,141784 2009-03-24 20:55:36 -07:00
Andreas Huber
715222bb03 Automated import from //branches/master/...@141712,141712 2009-03-24 20:48:51 -07:00
Wu-cheng Li
7110bf708f Automated import from //branches/master/...@141615,141615 2009-03-24 20:39:31 -07:00
Jason Sams
6023a5c6b1 Automated import from //branches/master/...@141599,141599 2009-03-24 20:37:37 -07:00
Mathias Agopian
e74be0afd9 Automated import from //branches/master/...@141504,141504 2009-03-24 20:25:55 -07:00
Jason Sams
3cff302213 Automated import from //branches/master/...@141471,141471 2009-03-24 20:21:49 -07:00
Jack Palevich
df351ba573 Automated import from //branches/cupcake/...@142481,142481 2009-03-24 20:18:08 -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
Andreas Huber
e4d3058e2f Automated import from //branches/cupcake/...@141708,141708 2009-03-24 18:14:23 -07:00
Wu-cheng Li
ab9687f0f8 Automated import from //branches/cupcake/...@141613,141613 2009-03-24 18:01:34 -07:00
Jason Sams
4d45243cea Automated import from //branches/cupcake/...@141597,141597 2009-03-24 17:58:31 -07:00