OSDN Git Service
Jeff Hamilton [Fri, 4 Jun 2010 20:52:45 +0000 (13:52 -0700)]
am
1e2e2aea: am
4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '
1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac' into kraken
* commit '
1e2e2aea8ce3b1c39f4d0f753e3f7081c94a0bac':
Don't crash when low storage is encountered pre-boot completion.
Jeff Hamilton [Fri, 4 Jun 2010 20:50:31 +0000 (13:50 -0700)]
am
4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '
4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp
* commit '
4b3309211ed6f3532b44481945a4725143d50b8a':
Don't crash when low storage is encountered pre-boot completion.
Dianne Hackborn [Fri, 4 Jun 2010 20:30:32 +0000 (13:30 -0700)]
Merge "Add support for heavy-weight applications." into kraken
The Android Open Source Project [Fri, 4 Jun 2010 19:58:09 +0000 (12:58 -0700)]
am
2d743fe2: merge from open-source master
Merge commit '
2d743fe2f39397d41334001d897eb78da56e94ef' into kraken
* commit '
2d743fe2f39397d41334001d897eb78da56e94ef':
Add better error handling for savePicture and restorePicture
The Android Open Source Project [Fri, 4 Jun 2010 18:07:49 +0000 (11:07 -0700)]
merge from open-source master
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
Jaikumar Ganesh [Fri, 4 Jun 2010 16:46:03 +0000 (09:46 -0700)]
Merge "Delete local references to avoid reference table overflow." into kraken
Wu-cheng Li [Fri, 4 Jun 2010 10:38:25 +0000 (03:38 -0700)]
Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken
Eric Laurent [Fri, 4 Jun 2010 07:14:46 +0000 (00:14 -0700)]
Merge "Issue
2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken
Wu-cheng Li [Fri, 4 Jun 2010 05:32:05 +0000 (22:32 -0700)]
Merge "Add camera metering mode API." into kraken
Brad Fitzpatrick [Thu, 3 Jun 2010 23:07:51 +0000 (16:07 -0700)]
Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken
Andreas Huber [Thu, 3 Jun 2010 22:31:56 +0000 (15:31 -0700)]
am
e896d416: am
2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
Merge commit '
e896d41699ffe7be932102d7ccc9566f41ddb447' into kraken
* commit '
e896d41699ffe7be932102d7ccc9566f41ddb447':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
Andreas Huber [Thu, 3 Jun 2010 22:30:03 +0000 (15:30 -0700)]
am
2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
Merge commit '
2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp
* commit '
2e3761ba43f634e97ac493f4b79e5e53954a1491':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
Andreas Huber [Thu, 3 Jun 2010 22:28:13 +0000 (15:28 -0700)]
Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
Romain Guy [Thu, 3 Jun 2010 21:26:21 +0000 (14:26 -0700)]
Merge "Add better error handling for savePicture and restorePicture"
Dirk Dougherty [Thu, 3 Jun 2010 20:00:31 +0000 (13:00 -0700)]
am
b85a1679: am
85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
Merge commit '
b85a1679a4a6fae5dd39611ae594f5e2b945407c' into kraken
* commit '
b85a1679a4a6fae5dd39611ae594f5e2b945407c':
Doc change: Adjust security sandbox description.
Dirk Dougherty [Thu, 3 Jun 2010 19:58:35 +0000 (12:58 -0700)]
am
85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
Merge commit '
85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp
* commit '
85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
Doc change: Adjust security sandbox description.
Dirk Dougherty [Thu, 3 Jun 2010 19:57:06 +0000 (12:57 -0700)]
Merge "Doc change: Adjust security sandbox description." into froyo
James Dong [Thu, 3 Jun 2010 18:30:03 +0000 (11:30 -0700)]
am
c40209ac: am
28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
Merge commit '
c40209ac60a64a7c08b0d0028060d5308fd7a0b8' into kraken
* commit '
c40209ac60a64a7c08b0d0028060d5308fd7a0b8':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
James Dong [Thu, 3 Jun 2010 18:27:19 +0000 (11:27 -0700)]
am
28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
Merge commit '
28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp
* commit '
28a92b2e76a13c18dc23e5239717b122a174182f':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
James Dong [Thu, 3 Jun 2010 18:26:09 +0000 (11:26 -0700)]
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
The Android Open Source Project [Thu, 3 Jun 2010 16:09:07 +0000 (09:09 -0700)]
am
ee7e6a78: merge from open-source master
Merge commit '
ee7e6a78e28b360826f215e0e84d43b1513b6401' into kraken
* commit '
ee7e6a78e28b360826f215e0e84d43b1513b6401':
Improved error-handling in Rfc822Tokenizer
The Android Open Source Project [Thu, 3 Jun 2010 16:03:58 +0000 (09:03 -0700)]
merge from open-source master
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
Eric Laurent [Wed, 2 Jun 2010 06:49:17 +0000 (23:49 -0700)]
Issue
2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications.
First drop of audio framework modifications for audio effects support.
- AudioTrack/AudioRecord:
Added support for auxiliary effects in AudioTrack
Added support for audio sessions
Fixed left right channel inversion in setVolume()
- IAudioFlinger:
Added interface methods for effect enumeraiton and instantiation
Added support for audio sessions.
- IAudioTrack:
Added method to attach auxiliary effect.
- AudioFlinger
Created new classes to control effect engines in effect library and manage effect connections to tracks or
output mix:
EffectModule: wrapper object controlling the effect engine implementation in the effect library. There
is one EffectModule per instance of an effect in a given audio session
EffectChain: group of effects associated to one audio session. There is one EffectChain per audio session.
EffectChain for session 0 is for output mix effects, other chains are attached to audio tracks
with same session ID. Each chain contains a variable number of EffectModules
EffectHandle: implements the IEffect interface. There is one EffectHandle object for each application
controlling (or using) an effect module. THe EffectModule maintians a list of EffectHandles.
Added support for effect modules and effect chains creation in PlaybackThread.
modified mixer thread loop to allow track volume control by effect modules and call effect processing.
-AudioMixer
Each track now specifies its output buffer used by mixer for accumulation
Modified mixer process functions to process tracks by groups of tracks with same buffer
Modified track process functions to support accumulation to auxiliary channel
Change-Id: I26d5f7c9e070a89bdd383e1a659f8b7ca150379c
Jeff Brown [Wed, 2 Jun 2010 22:46:13 +0000 (15:46 -0700)]
Merge "Fixed some minor bugs in MotionEvent recycling." into kraken
Scott Main [Wed, 2 Jun 2010 20:46:53 +0000 (13:46 -0700)]
am
105e1c5a: am
6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '
105e1c5adc3da14996d659ac403e7254b81bcb76' into kraken
* commit '
105e1c5adc3da14996d659ac403e7254b81bcb76':
docs: a couple doc bug fixes
Scott Main [Wed, 2 Jun 2010 20:44:44 +0000 (13:44 -0700)]
am
6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '
6a297118724f31b1063b74f52295d459ec4f58dc' into froyo-plus-aosp
* commit '
6a297118724f31b1063b74f52295d459ec4f58dc':
docs: a couple doc bug fixes
Scott Main [Wed, 2 Jun 2010 20:43:18 +0000 (13:43 -0700)]
Merge "docs: a couple doc bug fixes" into froyo
The Android Open Source Project [Wed, 2 Jun 2010 16:03:04 +0000 (09:03 -0700)]
am
1bd7597b: merge from open-source master
Merge commit '
1bd7597b8cdaf39d1183077c463cb30596eb31b0' into kraken
* commit '
1bd7597b8cdaf39d1183077c463cb30596eb31b0':
Replaced raw string arguments for Context.getSystemService() with final Context variables
The Android Open Source Project [Wed, 2 Jun 2010 15:54:59 +0000 (08:54 -0700)]
am
c8763858: merge from open-source master
Merge commit '
c8763858cfcae8be89c0f88df87bf9a3ad90ae64' into kraken
* commit '
c8763858cfcae8be89c0f88df87bf9a3ad90ae64':
Fix for issue 895 (missing android: prefix), Removed unused imports
The Android Open Source Project [Wed, 2 Jun 2010 15:54:47 +0000 (08:54 -0700)]
merge from open-source master
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
The Android Open Source Project [Wed, 2 Jun 2010 15:41:59 +0000 (08:41 -0700)]
merge from open-source master
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
Kenny Root [Wed, 2 Jun 2010 05:56:39 +0000 (22:56 -0700)]
Merge "Improved error-handling in Rfc822Tokenizer"
Kenny Root [Wed, 2 Jun 2010 03:54:21 +0000 (20:54 -0700)]
am
a6703415: am
85fb2066: Amend previous ndc commit
Merge commit '
a6703415ead229d6387973c25f5b833cefd26e9b' into kraken
* commit '
a6703415ead229d6387973c25f5b833cefd26e9b':
Amend previous ndc commit
Kenny Root [Wed, 2 Jun 2010 03:52:38 +0000 (20:52 -0700)]
am
85fb2066: Amend previous ndc commit
Merge commit '
85fb20665feadda526ad422c093b859e8c4d40bc' into froyo-plus-aosp
* commit '
85fb20665feadda526ad422c093b859e8c4d40bc':
Amend previous ndc commit
Kenny Root [Wed, 2 Jun 2010 02:58:32 +0000 (19:58 -0700)]
am
847b82d8: am
89bc1395: Merge "Add more error checking for ndc" into froyo
Merge commit '
847b82d8a6d3cc6969cbeeaf9ca7e879abab482a' into kraken
* commit '
847b82d8a6d3cc6969cbeeaf9ca7e879abab482a':
Add more error checking for ndc
Kenny Root [Wed, 2 Jun 2010 02:56:42 +0000 (19:56 -0700)]
am
89bc1395: Merge "Add more error checking for ndc" into froyo
Merge commit '
89bc1395748a0a139db82adbf01166ed6fa79766' into froyo-plus-aosp
* commit '
89bc1395748a0a139db82adbf01166ed6fa79766': (392 commits)
Add more error checking for ndc
Add javadoc for camera scene modes.
more clean-up in preparation of bigger changes
Fix a typo in Singleton<>
Avoid copying for input recording frames in CameraSource
Add video frame parameter.
more clean-up of Surfaceflinger's client management
Better sniffing of MPEG4 content by checking for a compatible sub-brand.
Remove the logic in CameraSource using CameraParameters class to find out the buffer size.
Add support for gps altitude EXIF tags.
minor clean-up GLclampx -> GLclampf
clean-up dead-code
Make sure to use filtering while in fixed-size mode
oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
Avoid repeatedly allocating and freeing memory in CameraSource
After failing to create an AudioTrack, only stop the source if we were the ones starting it.
Convert a number of assertions into runtime errors (OggExtractor)
fix [
2712278] The preview buffer left some black borders in left and bottom edges
Fix
2667859: change text back to default size
Support for thumbnail extraction in the Matroska extractor.
...
Kenny Root [Wed, 2 Jun 2010 02:55:01 +0000 (19:55 -0700)]
Merge "Add more error checking for ndc" into froyo
Mathias Agopian [Tue, 1 Jun 2010 23:00:07 +0000 (16:00 -0700)]
Merge "fix a bug where fading in/out of opaque 32-bits windows wasn't working" into kraken
Mathias Agopian [Mon, 12 Apr 2010 22:34:55 +0000 (15:34 -0700)]
fix a bug where fading in/out of opaque 32-bits windows wasn't working
opaque 32-bits windows are now allocated as RGBX_8888 buffers and
SurfaceFlinger always uses GL_MODULATE instead of trying to
optimize to GL_REPLACE when possible (makes no sense on
h/w accelerated GL).
we still have a small hack for devices that don't support
RGBX_8888 in their gralloc implementation where we revert to
RGBA_8888.
Dirk Dougherty [Tue, 1 Jun 2010 22:46:53 +0000 (15:46 -0700)]
am
8799cdfb: am
de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Merge commit '
8799cdfb012935501e47f15f28d6a8ed90bd464d' into kraken
* commit '
8799cdfb012935501e47f15f28d6a8ed90bd464d':
Doc change: rename slide decks for sorting by year then quarter.
Dirk Dougherty [Tue, 1 Jun 2010 22:45:24 +0000 (15:45 -0700)]
am
de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Merge commit '
de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp
* commit '
de56c27dab020bf85187c8bcfc6842cb31006c59':
Doc change: rename slide decks for sorting by year then quarter.
Dirk Dougherty [Tue, 1 Jun 2010 22:44:02 +0000 (15:44 -0700)]
Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Dan Egnor [Tue, 1 Jun 2010 21:44:35 +0000 (14:44 -0700)]
am
1f5e8473: am
a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '
1f5e847350ef1aece046666e20e7692a1651d9dc' into kraken
* commit '
1f5e847350ef1aece046666e20e7692a1651d9dc':
Comment-only change to add documentation for FileObserver
Dan Egnor [Tue, 1 Jun 2010 21:28:46 +0000 (14:28 -0700)]
am
a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '
a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp
* commit '
a80331c4d75cb8a7122e31315bc1e2950131659c':
Comment-only change to add documentation for FileObserver
Dan Egnor [Tue, 1 Jun 2010 21:09:20 +0000 (14:09 -0700)]
Merge "Comment-only change to add documentation for FileObserver" into froyo
Dirk Dougherty [Tue, 1 Jun 2010 18:13:29 +0000 (11:13 -0700)]
am
bce5edaf: am
862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
Merge commit '
bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe' into kraken
* commit '
bce5edaf46e2abbfb07f3a292b1b967fab7d9ffe':
Doc change: updated dashboards stats.
Dirk Dougherty [Tue, 1 Jun 2010 18:07:56 +0000 (11:07 -0700)]
am
862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
Merge commit '
862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp
* commit '
862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
Doc change: updated dashboards stats.
Dirk Dougherty [Tue, 1 Jun 2010 18:04:20 +0000 (11:04 -0700)]
Merge "Doc change: updated dashboards stats." into froyo
Mathias Agopian [Fri, 28 May 2010 21:22:23 +0000 (14:22 -0700)]
more clean-up in preparation of bigger changes
the most important change here is the renaming of
ISurfaceFlingerClient to ISurfaceComposerClient
Change-Id: I94e18b0417f50e06f21377446639c61f65f959b3
Mathias Agopian [Fri, 28 May 2010 22:13:30 +0000 (15:13 -0700)]
Fix a typo in Singleton<>
it could cause the sLock field to be emitted several times
in different compilation unit. it also prevented to
have 2 Singleton<> in the same file.
Christopher Tate [Fri, 28 May 2010 19:52:43 +0000 (12:52 -0700)]
am
5c9d9949: am
6ee412d5: Also dump system process threads halfway through the watchdog interval
Merge commit '
5c9d99496dab7a5cfe7cd37df749075ec9b4421b' into kraken
* commit '
5c9d99496dab7a5cfe7cd37df749075ec9b4421b':
Also dump system process threads halfway through the watchdog interval
Christopher Tate [Fri, 28 May 2010 19:50:05 +0000 (12:50 -0700)]
am
6ee412d5: Also dump system process threads halfway through the watchdog interval
Merge commit '
6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp
* commit '
6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
Also dump system process threads halfway through the watchdog interval
James Dong [Fri, 28 May 2010 17:53:09 +0000 (10:53 -0700)]
Merge "Avoid copying for input recording frames in CameraSource" into kraken
Wu-cheng Li [Fri, 28 May 2010 11:34:13 +0000 (04:34 -0700)]
Merge "Add video frame parameter." into kraken
Mathias Agopian [Fri, 28 May 2010 03:04:05 +0000 (20:04 -0700)]
Merge "more clean-up of Surfaceflinger's client management" into kraken
Mathias Agopian [Fri, 28 May 2010 02:41:15 +0000 (19:41 -0700)]
more clean-up of Surfaceflinger's client management
SurfaceComposerClient now only exist on the WindowManager side,
the client side uses the new SurfaceClient class, which only
exposes what a client needs.
also instead of keeping mappings from IBinder to SurfaceComposerClients
we have a SurfaceClient per Surface (referring to the same IBinder), this
is made possible by the fact that SurfaceClient is very light.
Change-Id: I6a1f7015424f07871632a25ed6a502c55abfcfa6
Kenny Root [Thu, 27 May 2010 19:37:28 +0000 (12:37 -0700)]
am
6cc13745: am
94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
Merge commit '
6cc137459a21e67765d2490529a920ccfb14e362' into kraken
* commit '
6cc137459a21e67765d2490529a920ccfb14e362':
Fix typo in EastAsianWidth javadoc
Dirk Dougherty [Thu, 27 May 2010 19:37:22 +0000 (12:37 -0700)]
am
9eae9572: am
9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Merge commit '
9eae957207c016db032819eadef261addf994a0d' into kraken
* commit '
9eae957207c016db032819eadef261addf994a0d':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
Kenny Root [Thu, 27 May 2010 19:35:25 +0000 (12:35 -0700)]
am
94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
Merge commit '
94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp
* commit '
94f1751cb0c6ea4004ff86b3af89e06e00a66641':
Fix typo in EastAsianWidth javadoc
Dirk Dougherty [Thu, 27 May 2010 19:35:18 +0000 (12:35 -0700)]
am
9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Merge commit '
9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp
* commit '
9f95c64e66df7481b1c624c6cf29569ca384a822':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
Kenny Root [Thu, 27 May 2010 19:04:34 +0000 (12:04 -0700)]
Merge "Fix typo in EastAsianWidth javadoc" into froyo
Dirk Dougherty [Thu, 27 May 2010 18:46:26 +0000 (11:46 -0700)]
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Andreas Huber [Thu, 27 May 2010 17:16:54 +0000 (10:16 -0700)]
Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken
Jeff Hamilton [Thu, 27 May 2010 16:42:44 +0000 (09:42 -0700)]
am
edf228ce: am
dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Merge commit '
edf228ce1fc9aae9fe314229c19e80a434bb4393' into kraken
* commit '
edf228ce1fc9aae9fe314229c19e80a434bb4393':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
Jeff Hamilton [Thu, 27 May 2010 16:40:23 +0000 (09:40 -0700)]
am
dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Merge commit '
dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp
* commit '
dc46f6f6cc44954c23229019270b54b8912be825':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
Jeff Hamilton [Thu, 27 May 2010 16:39:19 +0000 (09:39 -0700)]
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Andreas Huber [Thu, 27 May 2010 15:57:23 +0000 (08:57 -0700)]
Merge "After failing to create an AudioTrack, only stop the source if we were the ones starting it." into kraken
Mathias Agopian [Thu, 27 May 2010 05:49:03 +0000 (22:49 -0700)]
Merge "minor clean-up GLclampx -> GLclampf" into kraken
Mathias Agopian [Thu, 27 May 2010 05:26:12 +0000 (22:26 -0700)]
minor clean-up GLclampx -> GLclampf
Mathias Agopian [Thu, 27 May 2010 05:20:39 +0000 (22:20 -0700)]
Merge "clean-up dead-code" into kraken
Mathias Agopian [Thu, 27 May 2010 05:19:19 +0000 (22:19 -0700)]
clean-up dead-code
Mathias Agopian [Thu, 27 May 2010 05:11:03 +0000 (22:11 -0700)]
Merge "Make sure to use filtering while in fixed-size mode" into kraken
Mathias Agopian [Thu, 27 May 2010 05:08:52 +0000 (22:08 -0700)]
Make sure to use filtering while in fixed-size mode
Irfan Sheriff [Thu, 27 May 2010 04:37:45 +0000 (21:37 -0700)]
am
8316e875: am
b3f3caef: Merge "Fix null pointer exception" into froyo
Merge commit '
8316e875baee53b661d5af8fa843d97e51acbcf6' into kraken
* commit '
8316e875baee53b661d5af8fa843d97e51acbcf6':
Fix null pointer exception
Irfan Sheriff [Thu, 27 May 2010 04:34:52 +0000 (21:34 -0700)]
am
b3f3caef: Merge "Fix null pointer exception" into froyo
Merge commit '
b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp
* commit '
b3f3caef38326be2b4aea309237f718e6e2d2b8a':
Fix null pointer exception
Mathias Agopian [Thu, 27 May 2010 04:34:52 +0000 (21:34 -0700)]
Merge "oopsie. forgot to displatch SET_BUFFERS_GEOMETRY" into kraken
Irfan Sheriff [Thu, 27 May 2010 04:32:29 +0000 (21:32 -0700)]
Merge "Fix null pointer exception" into froyo
Mathias Agopian [Thu, 27 May 2010 04:31:09 +0000 (21:31 -0700)]
oopsie. forgot to displatch SET_BUFFERS_GEOMETRY
Dirk Dougherty [Thu, 27 May 2010 01:35:22 +0000 (18:35 -0700)]
am
f69fd4dd: am
4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
Merge commit '
f69fd4dd481c10749a8651ab6c9cfda1dea68297' into kraken
* commit '
f69fd4dd481c10749a8651ab6c9cfda1dea68297':
Doc change: Suggest min keysize of 2048 for keys.
Dirk Dougherty [Thu, 27 May 2010 01:33:05 +0000 (18:33 -0700)]
am
4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
Merge commit '
4273ce19bf898ee41f2342209af6fe8ef4fb128e' into froyo-plus-aosp
* commit '
4273ce19bf898ee41f2342209af6fe8ef4fb128e':
Doc change: Suggest min keysize of 2048 for keys.
Dirk Dougherty [Thu, 27 May 2010 01:31:38 +0000 (18:31 -0700)]
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
James Dong [Thu, 27 May 2010 00:01:16 +0000 (17:01 -0700)]
Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
Dirk Dougherty [Wed, 26 May 2010 23:53:04 +0000 (16:53 -0700)]
am
81800015: am
fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo
Merge commit '
81800015afe3ee397bc6b07e37fd6dc57e3a3b9b' into kraken
* commit '
81800015afe3ee397bc6b07e37fd6dc57e3a3b9b':
Doc change: fix adt download page, misc doc fixes.
Dirk Dougherty [Wed, 26 May 2010 23:51:12 +0000 (16:51 -0700)]
am
fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo
Merge commit '
fa499e46203dba2db2bb40f71e5af1650315c67c' into froyo-plus-aosp
* commit '
fa499e46203dba2db2bb40f71e5af1650315c67c':
Doc change: fix adt download page, misc doc fixes.
Dirk Dougherty [Wed, 26 May 2010 23:49:46 +0000 (16:49 -0700)]
Merge "Doc change: fix adt download page, misc doc fixes." into froyo
Andreas Huber [Wed, 26 May 2010 20:10:47 +0000 (13:10 -0700)]
Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken
Irfan Sheriff [Wed, 26 May 2010 20:05:53 +0000 (13:05 -0700)]
am
c8390047: am
9ecca85f: Merge "Fix escaping of characters" into froyo
Merge commit '
c8390047bd2344032aca915816a8b91590835105' into kraken
* commit '
c8390047bd2344032aca915816a8b91590835105':
Fix escaping of characters
Irfan Sheriff [Wed, 26 May 2010 20:04:11 +0000 (13:04 -0700)]
am
9ecca85f: Merge "Fix escaping of characters" into froyo
Merge commit '
9ecca85f0613032590c6840cae48b54f3d626181' into froyo-plus-aosp
* commit '
9ecca85f0613032590c6840cae48b54f3d626181':
Fix escaping of characters
Irfan Sheriff [Wed, 26 May 2010 20:02:06 +0000 (13:02 -0700)]
Merge "Fix escaping of characters" into froyo
Andreas Huber [Wed, 26 May 2010 18:21:06 +0000 (11:21 -0700)]
Merge "Squashed commit of the following:" into kraken
Eric Laurent [Wed, 26 May 2010 06:48:30 +0000 (23:48 -0700)]
Merge "Fix issue
2667797: [Audio Effect Framework] new base class and binder interfaces for effect control." into kraken
Mathias Agopian [Wed, 26 May 2010 00:56:07 +0000 (17:56 -0700)]
Merge "fix [
2712278] The preview buffer left some black borders in left and bottom edges" into kraken
Mathias Agopian [Wed, 26 May 2010 00:51:34 +0000 (17:51 -0700)]
fix [
2712278] The preview buffer left some black borders in left and bottom edges
we were incorrectly flagging push_buffer surfaces as invalid
Change-Id: I4dfd4ffbbe8a71f7e23e835db8d71966416c29bb
Yu Shan Emily Lau [Wed, 26 May 2010 00:44:46 +0000 (17:44 -0700)]
am
6e0967b3: am
b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
Merge commit '
6e0967b3c4561e188df72f478baf16c6627b12be' into kraken
* commit '
6e0967b3c4561e188df72f478baf16c6627b12be':
Added the runtime parameters for the mediarecorder stress test.
Yu Shan Emily Lau [Wed, 26 May 2010 00:42:29 +0000 (17:42 -0700)]
am
b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
Merge commit '
b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp
* commit '
b0016e2b2162c916289d022f1572c0bc95158543':
Added the runtime parameters for the mediarecorder stress test.
Yu Shan Emily Lau [Wed, 26 May 2010 00:40:51 +0000 (17:40 -0700)]
Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
Jim Miller [Wed, 26 May 2010 00:13:18 +0000 (17:13 -0700)]
Merge "Fix
2667859: change text back to default size" into kraken
Robert Greenwalt [Tue, 25 May 2010 23:15:37 +0000 (16:15 -0700)]
am
88ccecf5: am
d1055a25: Make the NTP Cache max-age gservices-settable
Merge commit '
88ccecf573a52648052bc9c7858f345776f76e0e' into kraken
* commit '
88ccecf573a52648052bc9c7858f345776f76e0e':
Make the NTP Cache max-age gservices-settable
Robert Greenwalt [Tue, 25 May 2010 23:13:22 +0000 (16:13 -0700)]
am
d1055a25: Make the NTP Cache max-age gservices-settable
Merge commit '
d1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp
* commit '
d1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
Make the NTP Cache max-age gservices-settable
Andreas Huber [Tue, 25 May 2010 21:16:18 +0000 (14:16 -0700)]
Merge "Support for thumbnail extraction in the Matroska extractor." into kraken