ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
207 Commits 2 Branches 0 Tags 54 MiB
08e1a554ab
Commit Graph

207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
e53f640038 Merge branch 'readonly-p4-master' 2009-04-02 23:37:35 -07:00
Eric Fischer
88dbd8b00d Merge branch 'readonly-p4-master' 2009-04-02 23:32:28 -07:00
Evan Millar
4bc657c95b Merge branch 'readonly-p4-master' 2009-04-02 23:29:53 -07:00
Jean-Michel Trivi
479f45991f Merge branch 'readonly-p4-master' 2009-04-02 23:27:19 -07:00
Xia Wang
e92913171b Merge branch 'readonly-p4-master' 2009-04-02 23:22:15 -07:00
Suchi Amalapurapu
70fab66b4d Merge branch 'readonly-p4-master' 2009-04-02 23:19:43 -07:00
Chris Tate
84531e59dd Merge branch 'readonly-p4-master' 2009-04-02 23:17:06 -07:00
Jack Palevich
e177066308 Merge branch 'readonly-p4-master' 2009-04-02 23:06:30 -07:00
Jack Palevich
4ec2152709 AI 144401: am: CL 144282 Tweak this tool to work with the current directory structure. 
Also leave the "generated" directory around if it contains files that
  need to be checked in.
  Original author: jackpal

Automated import of CL 144401
 2009-04-02 23:05:05 -07:00
Amith Yamasani
be0cf6230f Merge branch 'readonly-p4-master' 2009-04-02 22:50:23 -07:00
Robert Greenwalt
d4dbd6d85f Merge branch 'readonly-p4-master' 2009-04-02 22:42:34 -07:00
Mike Lockwood
712a858b5a Merge branch 'readonly-p4-master' 2009-04-02 22:34:31 -07:00
The Android Open Source Project
7cdc711750 Merge branch 'readonly-p4-master' 
Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java
 2009-04-02 12:18:20 -07:00
Grace Kloba
a059185c3d Merge branch 'readonly-p4-master' 2009-04-02 10:56:49 -07:00
Leon Scroggins
5196165438 Merge branch 'readonly-p4-master' 2009-04-02 10:49:03 -07:00
Daisuke Miyakawa
bd9166e8c6 Merge branch 'readonly-p4-master' 2009-04-02 10:45:40 -07:00
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