OSDN Git Service
James Dong [Thu, 1 Jul 2010 21:11:01 +0000 (14:11 -0700)]
Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
Amith Yamasani [Thu, 1 Jul 2010 20:51:27 +0000 (13:51 -0700)]
Merge "DO NOT MERGE: Add a battery capacity value to the power profile." into gingerbread
Eric Laurent [Thu, 1 Jul 2010 18:54:00 +0000 (11:54 -0700)]
Merge "Fix issue
2811538: System server crash when disconnecting BT headset after using SCO off call." into gingerbread
Dianne Hackborn [Wed, 30 Jun 2010 23:05:30 +0000 (16:05 -0700)]
Merge "Introduce official public NativeWindow type." into gingerbread
Mathias Agopian [Wed, 30 Jun 2010 22:59:02 +0000 (15:59 -0700)]
Merge "fix live wallpapers on Droid" into gingerbread
Mathias Agopian [Wed, 30 Jun 2010 22:43:47 +0000 (15:43 -0700)]
fix live wallpapers on Droid
On omap3 h/w we force opaque formats to RGB_565 instead of RGBX_8888
because the GL driver doesn't support it. RGBX_8888 is always remapped
to RGBA_8888.
Change-Id: I0bfabeb98c8d3a399079e6797cf2a0ee95915324
Dianne Hackborn [Wed, 30 Jun 2010 20:56:17 +0000 (13:56 -0700)]
Introduce official public NativeWindow type.
Not yet hooked up to anything in the NDK, but requires renaming
the existing android_native_window_t type everywhere.
Change-Id: Iffee6ea39c93b8b34e20fb69e4d2c7c837e5ea2e
Jeff Brown [Wed, 30 Jun 2010 22:03:04 +0000 (15:03 -0700)]
Merge "Fix injection of specially intercepted keys like HOME." into gingerbread
Christopher Tate [Wed, 30 Jun 2010 21:55:44 +0000 (14:55 -0700)]
Merge "Remove memory monitoring from the system watchdog" into gingerbread
Jeff Brown [Wed, 30 Jun 2010 21:41:59 +0000 (14:41 -0700)]
Fix injection of specially intercepted keys like HOME.
This change mainly unwinds a premature optimization in the
dispatch pipeline.
To test HOME injection, run 'adb shell input keyevent 3'.
Change-Id: I1c4b7377c205da7c898014b8b07fc6dc1d46e4dd
Andreas Huber [Wed, 30 Jun 2010 18:32:31 +0000 (11:32 -0700)]
Merge "Support for vanilla YUV420sp => RGB565 color conversion." into gingerbread
Doug Zongker [Wed, 30 Jun 2010 18:17:00 +0000 (11:17 -0700)]
am
d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo
Merge commit '
d581484ef8fac80c15ebf652e66f918374df5109' into gingerbread
* commit '
d581484ef8fac80c15ebf652e66f918374df5109':
Verify hostname where possible, and clarify where not.
Doug Zongker [Wed, 30 Jun 2010 18:12:19 +0000 (11:12 -0700)]
Merge "Verify hostname where possible, and clarify where not." into froyo
Dianne Hackborn [Wed, 30 Jun 2010 02:20:40 +0000 (19:20 -0700)]
Implement default key handling for native code.
The native code now maintains a list of all keys that may use
default handling. If the app finishes one of these keys
without handling it, the key will be passed back off to Java
for default treatment.
Change-Id: I6a842a0d728eeafa4de7142fae573f8c11099e18
Scott Main [Wed, 30 Jun 2010 16:01:01 +0000 (09:01 -0700)]
am
b4d2e42a: docs: revise menu guide to focus more on using menu resources instead of defining menus in code. And revise some style.
Merge commit '
b4d2e42a8508a09f944b13f27c043952eef6c1cc' into gingerbread
* commit '
b4d2e42a8508a09f944b13f27c043952eef6c1cc':
docs: revise menu guide to focus more on using menu resources
James Dong [Wed, 30 Jun 2010 00:24:10 +0000 (17:24 -0700)]
Merge "Added encoding parameters set up for H263 video encoder" into gingerbread
Chris Tate [Wed, 30 Jun 2010 00:01:04 +0000 (17:01 -0700)]
Merge "Fix native input dispatch in the emulator." into gingerbread
Jeff Brown [Tue, 29 Jun 2010 23:52:21 +0000 (16:52 -0700)]
Fix native input dispatch in the emulator.
Set a default orientation of ROTATION_0.
Added some more careful checks based on whether we have valid
absolute axis information from the driver.
Reset key repeating during configuration changes since the keyboard
device may have been removed.
Change-Id: I685960828acffcb17595fc5683309e8064a76714
Scott Main [Tue, 29 Jun 2010 22:47:42 +0000 (15:47 -0700)]
Mathias Agopian [Tue, 29 Jun 2010 22:33:36 +0000 (15:33 -0700)]
Merge "remove a hack that was used only used on h/w we no longer support." into gingerbread
Mathias Agopian [Tue, 29 Jun 2010 22:31:58 +0000 (15:31 -0700)]
remove a hack that was used only used on h/w we no longer support.
this should fix the opal build.
Change-Id: I43d7633696fea5be6bc834293a832d22f6bdfc61
The Android Open Source Project [Tue, 29 Jun 2010 21:34:35 +0000 (14:34 -0700)]
set up fast-forward from froyo-release to gingerbread
Change-Id: I22fc9465f5d8a0144b31803f431602fe3bda516a
Daniel Sandler [Tue, 29 Jun 2010 19:28:07 +0000 (12:28 -0700)]
Merge "Support for tapping on an immersive-mode priority notification." into gingerbread
Dianne Hackborn [Tue, 29 Jun 2010 19:17:20 +0000 (12:17 -0700)]
Merge "Update native activity & event APIs to follow correct conventions." into gingerbread
Andreas Huber [Tue, 29 Jun 2010 18:45:39 +0000 (11:45 -0700)]
Merge "Add qcom's new OMX components to the list." into gingerbread
Dianne Hackborn [Mon, 28 Jun 2010 22:27:30 +0000 (15:27 -0700)]
Update native activity & event APIs to follow correct conventions.
Change-Id: Ie64fb3a9c68bc9c117fa5621b75d1f609e304e0e
Mike Lockwood [Tue, 29 Jun 2010 12:24:45 +0000 (05:24 -0700)]
Merge "Notifications: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
Mike Lockwood [Tue, 29 Jun 2010 12:24:22 +0000 (05:24 -0700)]
Merge "Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state" into gingerbread
Mathias Agopian [Tue, 29 Jun 2010 03:01:58 +0000 (20:01 -0700)]
Merge changes I93dfc4c8,I781953d6 into gingerbread
* changes:
fix[
2798925] Gingerbread TOT not booting
Revert "Revert "fix [
2793164] Spam 2x/second with TOT master in SurfaceFlinger""
Mathias Agopian [Tue, 29 Jun 2010 02:54:17 +0000 (19:54 -0700)]
fix[
2798925] Gingerbread TOT not booting
Fixed a typo where checking against the wrong constant caused GL_TEXTURE_EXTERNAL_OES
to be used with a regular texture, which some GL driver will choke on.
Change-Id: I93dfc4c8fa674433bbb678eee31954e9a8d0cb4b
Chris Tate [Tue, 29 Jun 2010 02:12:55 +0000 (19:12 -0700)]
Merge "Native input event dispatching." into gingerbread
Jeff Brown [Tue, 22 Jun 2010 08:27:15 +0000 (01:27 -0700)]
Native input event dispatching.
Target identification is now fully native.
Fixed a couple of minor issues related to input injection.
Native input enabled by default, can be disabled by setting
WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH to false.
Change-Id: I7edf66ed3e987cc9306ad4743ac57a116af452ff
James Dong [Mon, 28 Jun 2010 23:19:40 +0000 (16:19 -0700)]
Merge "Separate MediaRecorderClient with MediaPlayerClient" into gingerbread
Scott Main [Mon, 28 Jun 2010 22:31:35 +0000 (15:31 -0700)]
am
337b0873: docs: update backup guide and bmgr tool elaborate the guide to testing a backup agent and add links between the docs
Merge commit '
337b0873f43eac5f23483bec94bd8729f79d47ec' into gingerbread
* commit '
337b0873f43eac5f23483bec94bd8729f79d47ec':
docs: update backup guide and bmgr tool
Wei Huang [Mon, 28 Jun 2010 22:05:56 +0000 (15:05 -0700)]
Merge "new presence icons for video/audio chats." into gingerbread
Irfan Sheriff [Sat, 26 Jun 2010 02:49:58 +0000 (19:49 -0700)]
Merge "Add setWifiApConfiguration interface" into gingerbread
Mathias Agopian [Sat, 26 Jun 2010 01:02:21 +0000 (18:02 -0700)]
Revert "Revert "fix [
2793164] Spam 2x/second with TOT master in SurfaceFlinger""
This reverts commit
330dd304a471d260a73e342a240921c03c825f99.
James Dong [Fri, 25 Jun 2010 23:40:47 +0000 (16:40 -0700)]
Merge "Provide progress status report during authoring" into gingerbread
David Brown [Fri, 25 Jun 2010 22:54:55 +0000 (15:54 -0700)]
Merge "Placeholder icons for the "ringing" variant of stat_sys_phone_call." into gingerbread
Mathias Agopian [Fri, 25 Jun 2010 20:28:06 +0000 (13:28 -0700)]
Merge "Fix a bug in sp<> and wp<> which could cause memory corruptions" into gingerbread
Eric Laurent [Fri, 25 Jun 2010 19:35:30 +0000 (12:35 -0700)]
Merge "Various fixes and improvements in audio effects implementation" into gingerbread
Eric Laurent [Thu, 24 Jun 2010 00:38:20 +0000 (17:38 -0700)]
Various fixes and improvements in audio effects implementation
Effect API:
- Use different definitions for audio device, channels, formats... in AudioSystem and EffectApi:
Removed media/AudioCommon.h file created for initial version of EffectApi
- Indicate audio session and output ID to effect library when calling EffectCreate(). Session ID can be useful to optimize
the implementation of effect chains in the same audio session. Output ID can be used for effects implemented in audio hardware.
- Renamed EffectQueryNext() function to EffectQueryEffect() and changed operating mode:
now an index is passed for the queried effect instead of implicitly querying the next one.
- Added CPU load and memory usage indication in effects descriptor
- Added flags and commands to indicate changes in audio mode (ring tone, in call...) to effect engine
- Added flag to indicate hardware accelerated effect implementation.
- Renamed EffectFactoryApi.h to EffectsFactoryApi.h for consistency with EffectsFactory.c/h
Effect libraries:
- Reflected changes in Effect API
- Several fixes in reverb implementation
- Added build option TEST_EFFECT_LIBRARIES in makefile to prepare integration of actual effect library.
- Replaced pointer by integer identifier for library handle returned by effects factory
Audio effect framework:
- Added support for audio session -1 in preparation of output stage effects configuration.
- Reflected changes in Effect API
- Removed volume ramp up/down when effect is inserted/removed: this has to be taken care of by effect engines.
- Added some overflow verification on indexes used for deferred parameter updates via shared memory
- Added hardcoded CPU and memory limit check when creating a new effect instance
Change-Id: I43fee5182ee201384ea3479af6d0acb95092901d
Andreas Huber [Fri, 25 Jun 2010 16:25:19 +0000 (09:25 -0700)]
Revert "fix [
2793164] Spam 2x/second with TOT master in SurfaceFlinger"
This reverts commit
081bc5c47d8a980e6eafa70ddafcd89981586391.
Andreas Huber [Fri, 25 Jun 2010 18:03:42 +0000 (11:03 -0700)]
Merge "Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread
James Dong [Fri, 25 Jun 2010 16:43:14 +0000 (09:43 -0700)]
Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread
Mathias Agopian [Fri, 25 Jun 2010 04:49:02 +0000 (21:49 -0700)]
Fix a bug in sp<> and wp<> which could cause memory corruptions
when assigning a smart pointer to another one, we need to make
sure to read all the data we need from the right-hand-side
reference (the assignee) before we decRef the assigned.
This bug would cause linked-list of smart-pointers to fail
miserably.
Change-Id: Ibb554c15fddf909f7737c632b7c80322e80ea93f
Mathias Agopian [Fri, 25 Jun 2010 04:22:43 +0000 (21:22 -0700)]
fix [
2793164] Spam 2x/second with TOT master in SurfaceFlinger
Make sure to not use GL_TEXTURE_EXTERNAL when it's not supported
by the GL. The error was harmless, but annoying.
Change-Id: I571a9a9b05d35da51420950a6a6e95629067efd0
Scott Main [Fri, 25 Jun 2010 01:12:49 +0000 (18:12 -0700)]
am
56c778e6: Merge "docs: Remove the TOS from download flow and remove TOS entirely because it\'s no longer relevant to the SDK download package" into froyo
Merge commit '
56c778e6cfb2bd47ceae57d81e6b949da306e2e8' into gingerbread
* commit '
56c778e6cfb2bd47ceae57d81e6b949da306e2e8':
docs: Remove the TOS from download flow and remove TOS entirely because
Scott Main [Fri, 25 Jun 2010 01:10:41 +0000 (18:10 -0700)]
Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo
Joe Onorato [Fri, 25 Jun 2010 00:51:22 +0000 (17:51 -0700)]
Merge "Fix the notification vibration setting and add a test app that lets you recover from the busted state." into gingerbread
Dianne Hackborn [Fri, 25 Jun 2010 00:28:13 +0000 (17:28 -0700)]
Merge "Make bad notifications crash their application." into gingerbread
Dianne Hackborn [Thu, 24 Jun 2010 23:01:39 +0000 (16:01 -0700)]
am
5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '
5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread
* commit '
5827d3eaf3c53d1dc3ab0d638d935c219a5515a6':
Properly note the current active restore set's token
Dianne Hackborn [Thu, 24 Jun 2010 23:00:06 +0000 (16:00 -0700)]
Merge "Properly note the current active restore set's token" into froyo
Andreas Huber [Thu, 24 Jun 2010 20:14:37 +0000 (13:14 -0700)]
Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread
Dianne Hackborn [Thu, 24 Jun 2010 19:41:01 +0000 (12:41 -0700)]
Merge "Add APIs for finding heavy-weight apps." into gingerbread
Nick Pelly [Thu, 24 Jun 2010 19:15:29 +0000 (12:15 -0700)]
am
d19c397b: (-s ours) Merge "Do not log AT command traffic by default." into froyo
Merge commit '
d19c397b04f485e0af5990f3541e703934869290' into gingerbread
* commit '
d19c397b04f485e0af5990f3541e703934869290':
Do not log AT command traffic by default.
Nick Pelly [Thu, 24 Jun 2010 18:52:39 +0000 (11:52 -0700)]
Merge "Do not log AT command traffic by default." into froyo
James Dong [Thu, 24 Jun 2010 16:46:48 +0000 (09:46 -0700)]
Merge "Fixed the software AAC encoder" into gingerbread
Mike Lockwood [Thu, 24 Jun 2010 16:26:55 +0000 (09:26 -0700)]
Merge changes I11495d03,If5816721 into gingerbread
* changes:
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
Andreas Huber [Thu, 24 Jun 2010 16:05:08 +0000 (09:05 -0700)]
Merge "Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
Joe Onorato [Thu, 24 Jun 2010 00:46:46 +0000 (17:46 -0700)]
Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread
Christopher Tate [Wed, 23 Jun 2010 23:52:37 +0000 (16:52 -0700)]
Merge "Remember to initialize timestamps in the dispatch allocator" into gingerbread
Christopher Tate [Wed, 23 Jun 2010 23:50:30 +0000 (16:50 -0700)]
Remember to initialize timestamps in the dispatch allocator
Change-Id: I83a2d353c34ff84a7d130e602c6dedc6a5541944
Joe Onorato [Wed, 23 Jun 2010 23:08:06 +0000 (16:08 -0700)]
Merge "Fix bug
2772728 with the suggested fix. I wasn't able to reproduce it though." into gingerbread
James Dong [Wed, 23 Jun 2010 22:13:55 +0000 (15:13 -0700)]
Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread
Mike Lockwood [Wed, 23 Jun 2010 20:14:47 +0000 (13:14 -0700)]
Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread
Andreas Huber [Wed, 23 Jun 2010 20:14:16 +0000 (13:14 -0700)]
Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
Adam Powell [Wed, 23 Jun 2010 17:26:44 +0000 (10:26 -0700)]
Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
Scott Main [Wed, 23 Jun 2010 17:07:37 +0000 (10:07 -0700)]
am
753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Merge commit '
753e56090ed5acc0d2173a8e9ab1a9b96528720b' into gingerbread
* commit '
753e56090ed5acc0d2173a8e9ab1a9b96528720b':
docs: update backup dev guide with Android Backup Service registration info
Scott Main [Wed, 23 Jun 2010 16:57:46 +0000 (09:57 -0700)]
Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Eric Laurent [Wed, 23 Jun 2010 01:29:57 +0000 (18:29 -0700)]
Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread
Chia-chi Yeh [Wed, 23 Jun 2010 00:20:44 +0000 (17:20 -0700)]
Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread
Eric Laurent [Wed, 23 Jun 2010 00:08:55 +0000 (17:08 -0700)]
Merge "Fix issue
2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread
James Dong [Tue, 22 Jun 2010 21:28:15 +0000 (14:28 -0700)]
Merge "Single track optimization" into gingerbread
Dianne Hackborn [Tue, 22 Jun 2010 18:22:37 +0000 (11:22 -0700)]
Merge "First stab at attaching native event dispatching." into gingerbread
Dirk Dougherty [Tue, 22 Jun 2010 18:22:12 +0000 (11:22 -0700)]
am
17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Merge commit '
17ae646586663c59ad360bb72884beded7475687' into gingerbread
* commit '
17ae646586663c59ad360bb72884beded7475687':
Doc change: Fix description of certificate matching requirement for app updates.
Dianne Hackborn [Sat, 19 Jun 2010 01:09:33 +0000 (18:09 -0700)]
First stab at attaching native event dispatching.
Provides the basic infrastructure for a
NativeActivity's native code to get an object representing
its event stream that can be used to read input events.
Still work to do, probably some API changes, and reasonable
default key handling (so that for example back will still
work).
Change-Id: I6db891bc35dc9683181d7708eaed552b955a077e
Dirk Dougherty [Tue, 22 Jun 2010 18:13:48 +0000 (11:13 -0700)]
Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Daniel Sandler [Tue, 22 Jun 2010 18:08:40 +0000 (11:08 -0700)]
Merge "Fix javadocs." into gingerbread
Andreas Huber [Tue, 22 Jun 2010 17:11:15 +0000 (10:11 -0700)]
Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread
Andreas Huber [Tue, 22 Jun 2010 17:11:04 +0000 (10:11 -0700)]
Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
James Dong [Tue, 22 Jun 2010 17:05:02 +0000 (10:05 -0700)]
Merge "Audio/video sync during recording (second part)" into gingerbread
Mike Lockwood [Tue, 22 Jun 2010 13:44:03 +0000 (06:44 -0700)]
Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
Jack Palevich [Tue, 22 Jun 2010 12:08:40 +0000 (20:08 +0800)]
Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
Mathias Agopian [Tue, 22 Jun 2010 00:45:29 +0000 (17:45 -0700)]
remove unused YUV formats
Change-Id: Id0ae28b1700cf771cdbe0ca27b139d32cab90b2a
James Dong [Tue, 22 Jun 2010 00:35:27 +0000 (17:35 -0700)]
Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore's code" into gingerbread
Brad Fitzpatrick [Mon, 21 Jun 2010 22:31:01 +0000 (15:31 -0700)]
Merge "Start of work on passing around StrictMode policy over Binder calls." into gingerbread
Mathias Agopian [Mon, 21 Jun 2010 22:19:26 +0000 (15:19 -0700)]
fix [
2785833] valgrind error in android::Layer::requestBuffer
fix uninitialized variable
Change-Id: I99e1b619ae8c88dd9d77b3abf4762f801019047e
Mathias Agopian [Mon, 21 Jun 2010 22:11:18 +0000 (15:11 -0700)]
Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread
Mathias Agopian [Mon, 21 Jun 2010 22:10:13 +0000 (15:10 -0700)]
Merge "Improve SensorManager documentation" into gingerbread
Jeff Brown [Fri, 18 Jun 2010 03:52:56 +0000 (20:52 -0700)]
More native input event dispatching.
Added ANRs handling.
Added event injection.
Fixed a NPE ActivityManagerServer writing ANRs to the drop box.
Fixed HOME key interception.
Fixed trackball reporting.
Fixed pointer rotation in landscape mode.
Change-Id: I50340f559f22899ab924e220a78119ffc79469b7
Brad Fitzpatrick [Fri, 18 Jun 2010 20:07:53 +0000 (13:07 -0700)]
Start of work on passing around StrictMode policy over Binder calls.
This is (intendend to be) a no-op change.
At this stage, Binder RPCs just have an additional uint32 passed around
in the header, right before the interface name. But nothing is actually
done with them yet. That value should right now always be 0.
This now boots and seems to work.
Change-Id: I135b7c84f07575e6b9717fef2424d301a450df7b
Evan Millar [Mon, 21 Jun 2010 19:09:40 +0000 (12:09 -0700)]
Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread
Kenny Root [Mon, 21 Jun 2010 18:17:07 +0000 (11:17 -0700)]
am
30cf330f: Import revised translations
Merge commit '
30cf330fae137587d51aa4c026459db146705ba9' into gingerbread
* commit '
30cf330fae137587d51aa4c026459db146705ba9':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 16:02:13 +0000 (09:02 -0700)]
am
c4e38577: Import revised translations
Merge commit '
c4e38577f46a3b7953fffbb01b08eebc401fbc17' into gingerbread
* commit '
c4e38577f46a3b7953fffbb01b08eebc401fbc17':
Import revised translations
Chia-chi Yeh [Mon, 21 Jun 2010 15:54:19 +0000 (08:54 -0700)]
am
bd240c27: media: add AudioTrack::getMinFrameCount().
Merge commit '
bd240c2737913d6ed1982788699f93bbc52330c0' into gingerbread
* commit '
bd240c2737913d6ed1982788699f93bbc52330c0':
media: add AudioTrack::getMinFrameCount().
Daniel Sandler [Fri, 18 Jun 2010 02:14:44 +0000 (19:14 -0700)]
Merge "Fix SDK docs build." into gingerbread
Dianne Hackborn [Fri, 18 Jun 2010 01:43:31 +0000 (18:43 -0700)]
am
57f4503e: Work on issue #
2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '
57f4503e1a129d6a648f2378d36a060998a577a0' into gingerbread
* commit '
57f4503e1a129d6a648f2378d36a060998a577a0':
Work on issue #
2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Scott Main [Fri, 18 Jun 2010 01:43:13 +0000 (18:43 -0700)]
am
5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '
5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread
* commit '
5f11e95f0041e163e8aa9e429aec92c8ee942233':
docs: small edits to catchup to edits made in html pushed live
James Dong [Fri, 18 Jun 2010 01:43:10 +0000 (18:43 -0700)]
am
39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Merge commit '
39e876ad743f203fe005333947c61383772b0d14' into gingerbread
* commit '
39e876ad743f203fe005333947c61383772b0d14':
When filling the cache, we always time out waiting for a condition that won't occur.