drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
399 Commits 1 Branch 0 Tags
Commit Graph

61 Commits

Author SHA1 Message Date
Jean-Michel Trivi
73cf2a11eb Merge branch 'readonly-p4-master' 2009-04-02 23:27:19 -07:00
Jean-Michel Trivi
e398e3bf22 AI 144409: am: CL 144327 am: CL 144326 Start the thread that initializes the camera for the test under lock to make sure the monitor is notified after it has started waiting. 
Original author: jmtrivi
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144409
 2009-04-02 23:26:11 -07:00
Xia Wang
e7e370369d Merge branch 'readonly-p4-master' 2009-04-02 23:22:15 -07:00
Xia Wang
74e77fba25 AI 144407: am: CL 144314 am: CL 144313 Add two test cases for AudioTrack.java 
getMinBufferSize() returns ERROR_BAD_VALUE if
  sampleRateInHz < 4000 or > 48000.
  Original author: xiaw
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144407
 2009-04-02 23:21:07 -07:00
Eric Laurent
070410ec7f Merge branch 'readonly-p4-master' 2009-04-02 09:33:55 -07:00
Eric Laurent
3547cc0124 AI 144097: am: CL 144054 am: CL 144053 Fix issue #1751242 A2DP playback fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800 
The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger().
  The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it.
  Original author: elaurent
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144097
 2009-04-02 09:32:43 -07:00
The Android Open Source Project
caee1703fe Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:25 -07:00
Yu Shan Emily Lau
aa7d8c88d3 AI 143906: am: CL 143905 am: CL 143904 Fix the failure in the media recorder large test by adding the Camera permission. 
Original author: yslau
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143906
 2009-03-31 18:16:08 -07:00
The Android Open Source Project
762d30a313 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
Doug Kwan
d94755bf33 AI 143430: Remove broken and unused code. 
This CL removes RoManager::getDevicePrivateKey() and its declaration.
  The method is not used anywhere and it contains bad code that returns
  reference to a local object.
  This is tested by building the master tree and running the framework
  testsuite.  No error was found in testsuite.
  BUG=1737538

Automated import of CL 143430
 2009-03-28 21:53:49 -07:00
Dave Sparks
17612fcdcb AI 143396: am: CL 143267 am: CL 143127 Media recorder service requires android.permission.CAMERA to record video 
Original author: davidsparks
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143396
 2009-03-27 19:56:11 -07:00
Mike Lockwood
64a5458e76 AI 143360: am: CL 143209 am: CL 143001 Remove sdutils from user build to save 12K on /system partition. 
BUG=1739507
  Original author: lockwood
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143360
 2009-03-27 19:14:26 -07:00
The Android Open Source Project
b41349409b Merge commit 'goog/cupcake' 2009-03-27 18:48:32 -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
Dave Sparks
ba9844ee12 AI 143127: Media recorder service requires android.permission.CAMERA to record video 
BUG=1742392

Automated import of CL 143127
 2009-03-27 12:57:40 -07:00
Mike Lockwood
d4d70d95ea Automated import from //branches/cupcake/...@143001,143001 2009-03-26 15:59:52 -07:00
Jean-Michel Trivi
26a857e181 Automated import from //branches/master/...@142377,142377 2009-03-24 22:43:38 -07:00
Yu Shan Emily Lau
3e7b3c0f27 Automated import from //branches/master/...@142150,142150 2009-03-24 22:20:13 -07:00
Eric Laurent
ba5aba22ab Automated import from //branches/master/...@142066,142066 2009-03-24 21:29:21 -07:00
Andreas Huber
effd8d55b2 Automated import from //branches/master/...@141712,141712 2009-03-24 20:48:51 -07:00
Dave Sparks
821ef406f8 Automated import from //branches/master/...@141595,141595 2009-03-24 20:36:20 -07:00
Niko Catania
a06f6e328d Automated import from //branches/master/...@141214,141214 2009-03-24 19:50:50 -07:00
Jean-Michel Trivi
108762b6e0 Automated import from //branches/master/...@141201,141201 2009-03-24 19:48:32 -07:00
Jean-Michel Trivi
cb80d9fd97 Automated import from //branches/cupcake/...@142374,142374 2009-03-24 19:33:18 -07:00
Yu Shan Emily Lau
6887e54e5c Automated import from //branches/cupcake/...@142148,142148 2009-03-24 19:04:51 -07:00
Eric Laurent
e0366d0b2f Automated import from //branches/cupcake/...@142064,142064 2009-03-24 18:56:19 -07:00
Jean-Michel Trivi
e89554b02d Automated import from //branches/master/...@140869,140869 2009-03-24 18:46:20 -07:00
Jason Sams
ebb020aebc Automated import from //branches/master/...@140868,140868 2009-03-24 18:45:22 -07:00
Dianne Hackborn
678764730b Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:48 -07:00
Niko Catania
70322464af Automated import from //branches/master/...@140812,140812 2009-03-24 18:35:07 -07:00
Niko Catania
5f44349c12 Automated import from //branches/master/...@140804,140804 2009-03-24 18:32:41 -07:00
Andreas Huber
4873375b2a Automated import from //branches/cupcake/...@141708,141708 2009-03-24 18:14:23 -07:00
Jean-Michel Trivi
e025d2d746 Automated import from //branches/master/...@140665,140665 2009-03-24 18:11:52 -07:00
Jean-Michel Trivi
a5e5643d5d Automated import from //branches/master/...@140567,140567 2009-03-24 17:57:26 -07:00
Dave Sparks
cb9a44ed08 Automated import from //branches/cupcake/...@141591,141591 2009-03-24 17:57:12 -07:00
Jason Parekh
3ff637187a Automated import from //branches/master/...@140509,140509 2009-03-24 17:50:29 -07:00
Jean-Baptiste Queru
680f8c77d5 Deal better with situations where OpenCORE is disabled. 2009-03-23 12:00:23 -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
b22d55b9f8 auto import from //depot/cupcake/@136620 2009-03-05 15:45:10 -08: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
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
root
9f25eadc48 Fixed typing mistake causing process crashes. 2009-03-02 20:48:27 +01:00