OSDN Git Service

android-x86/frameworks-native.git
14 years agoupdate EGL headers to the latest
Mathias Agopian [Thu, 10 Jun 2010 01:46:35 +0000 (18:46 -0700)]
update EGL headers to the latest

note that this doesn't update the EGL stubs.

Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae

14 years agoupdate GL ES stub libraries with the new GL ES headers
Mathias Agopian [Thu, 10 Jun 2010 01:20:21 +0000 (18:20 -0700)]
update GL ES stub libraries with the new GL ES headers

Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5

14 years agofix OpenGL ES extension headers from khronos
Mathias Agopian [Thu, 10 Jun 2010 01:19:11 +0000 (18:19 -0700)]
fix OpenGL ES extension headers from khronos

the official headers have a couple typos, which
this CL fixes.

Change-Id: I0359531a05a4a62ddbdce70c5841ec1c355feb3b

14 years agoupdate the OpenGL ES headers to the latest
Mathias Agopian [Thu, 10 Jun 2010 01:08:15 +0000 (18:08 -0700)]
update the OpenGL ES headers to the latest

Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547

14 years agoMerge "allow re-targetting of surfaces" into kraken
Mathias Agopian [Wed, 9 Jun 2010 03:14:11 +0000 (20:14 -0700)]
Merge "allow re-targetting of surfaces" into kraken

14 years agoallow re-targetting of surfaces
Mathias Agopian [Wed, 9 Jun 2010 02:54:15 +0000 (19:54 -0700)]
allow re-targetting of surfaces

Surfaces can now be parcelized and sent to remote
processes. When a surface crosses a process
boundary, it looses its connection with the
current process and gets attached to the new one.

Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0

14 years agoam 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabl...
Jim Miller [Tue, 8 Jun 2010 23:33:26 +0000 (16:33 -0700)]
am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo

Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled

14 years agoMerge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into...
Jim Miller [Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)]
Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo

14 years agofix [2751143] Device crashes when in a text box for too long
Mathias Agopian [Tue, 8 Jun 2010 22:40:56 +0000 (15:40 -0700)]
fix [2751143] Device crashes when in a text box for too long

14 years agoMerge "Remove some hard-coded encoding parameters" into kraken
James Dong [Tue, 8 Jun 2010 20:13:26 +0000 (13:13 -0700)]
Merge "Remove some hard-coded encoding parameters" into kraken

14 years agoam 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Romain Guy [Tue, 8 Jun 2010 20:00:30 +0000 (13:00 -0700)]
am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo

Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into kraken

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.

14 years agoMerge "Add a method to hide/show a SurfaceView's surface." into froyo
Romain Guy [Tue, 8 Jun 2010 19:59:36 +0000 (12:59 -0700)]
Merge "Add a method to hide/show a SurfaceView's surface." into froyo

14 years agoMerge "Log.wtf when databases go to be downgraded." into kraken
Brad Fitzpatrick [Tue, 8 Jun 2010 19:37:34 +0000 (12:37 -0700)]
Merge "Log.wtf when databases go to be downgraded." into kraken

14 years agoMerge "Second part of speeding up video recording frame rate" into kraken
James Dong [Tue, 8 Jun 2010 17:14:26 +0000 (10:14 -0700)]
Merge "Second part of speeding up video recording frame rate" into kraken

14 years agoMerge "Initial checkin of preliminary rtsp support for stagefright." into kraken
Andreas Huber [Tue, 8 Jun 2010 16:19:07 +0000 (09:19 -0700)]
Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken

14 years agoam cb52cb52: Fix SDK build.
Jim Miller [Tue, 8 Jun 2010 04:23:53 +0000 (21:23 -0700)]
am cb52cb52: Fix SDK build.

Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.

14 years agoam bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled...
Jim Miller [Tue, 8 Jun 2010 02:25:49 +0000 (19:25 -0700)]
am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo

Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.

14 years agoMerge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo
Jim Miller [Tue, 8 Jun 2010 02:24:45 +0000 (19:24 -0700)]
Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo

14 years agoam ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Christopher Tate [Tue, 8 Jun 2010 01:48:27 +0000 (18:48 -0700)]
am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo

Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into kraken

* commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
  Don't bring up Launcher until after boot complete

14 years agoMerge "Don't bring up Launcher until after boot complete" into froyo
Christopher Tate [Tue, 8 Jun 2010 01:46:46 +0000 (18:46 -0700)]
Merge "Don't bring up Launcher until after boot complete" into froyo

14 years agoam d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityExceptio...
Dianne Hackborn [Tue, 8 Jun 2010 01:32:04 +0000 (18:32 -0700)]
am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo

Merge commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into kraken

* commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
  Fix issue #2749322: addPackageToPreferred throws SecurityException

14 years agoMerge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo
Dianne Hackborn [Tue, 8 Jun 2010 00:32:02 +0000 (17:32 -0700)]
Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo

14 years agoam 5a671d03: Cut logging, boost efficiency of ThrottleService
Robert Greenwalt [Mon, 7 Jun 2010 23:59:01 +0000 (16:59 -0700)]
am 5a671d03: Cut logging, boost efficiency of ThrottleService

Merge commit '5a671d03e3abe522a761a43b0460f9f3816b14ed' into kraken

* commit '5a671d03e3abe522a761a43b0460f9f3816b14ed':
  Cut logging, boost efficiency of ThrottleService

14 years agoMerge "Initial checkin of preliminary support for "http live" streaming in stagefrigh...
Andreas Huber [Mon, 7 Jun 2010 22:20:14 +0000 (15:20 -0700)]
Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken

14 years agoMerge "Serialize all commands for a particular profile." into kraken
Jaikumar Ganesh [Mon, 7 Jun 2010 21:10:08 +0000 (14:10 -0700)]
Merge "Serialize all commands for a particular profile." into kraken

14 years agoMerge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken
Jaikumar Ganesh [Mon, 7 Jun 2010 21:09:49 +0000 (14:09 -0700)]
Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken

14 years agoMerge "Add a new state machine for handling the incoming / outgoing profile connectio...
Jaikumar Ganesh [Mon, 7 Jun 2010 21:09:39 +0000 (14:09 -0700)]
Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken

14 years agoMerge "PackageManagerService: always install native binaries from .apk" into kraken
David 'Digit' Turner [Mon, 7 Jun 2010 21:02:38 +0000 (14:02 -0700)]
Merge "PackageManagerService: always install native binaries from .apk" into kraken

14 years agoMerge "Initial checkin of "foundation" library for future stagefright development...
Andreas Huber [Mon, 7 Jun 2010 19:50:05 +0000 (12:50 -0700)]
Merge "Initial checkin of "foundation" library for future stagefright development." into kraken

14 years agoMerge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve...
James Dong [Mon, 7 Jun 2010 17:19:58 +0000 (10:19 -0700)]
Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken

14 years agoam df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
Christopher Tate [Sun, 6 Jun 2010 19:10:08 +0000 (12:10 -0700)]
am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo

Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into kraken

* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
  Watchdog now records kernel stacks when it fires

14 years agoam 5474902f: Merge "xhdpi" into froyo
Dianne Hackborn [Sun, 6 Jun 2010 19:10:05 +0000 (12:10 -0700)]
am 5474902f: Merge "xhdpi" into froyo

Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi

14 years agoam f9610b38: Merge "Make the DUN apn data secure." into froyo
Robert Greenwalt [Sun, 6 Jun 2010 19:10:00 +0000 (12:10 -0700)]
am f9610b38: Merge "Make the DUN apn data secure." into froyo

Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.

14 years agooptimize Surface.readFromParcel()
Mathias Agopian [Sat, 5 Jun 2010 01:26:32 +0000 (18:26 -0700)]
optimize Surface.readFromParcel()

this is called for each relayout() and used to create a full Surface (cpp)
which in turn did some heavy work (including an IPC with surfaceflinger),
most of the time to destroy it immediatelly when the returned surface
(the one in the parcel) was the same.

we now more intelligentely read from the parcel and construct the new
object only if needed.

Change-Id: Idfd40d9ac96ffc6d4ae5fd99bcc0773e131e2267

14 years agosplit surface management from surface's buffers management
Mathias Agopian [Tue, 1 Jun 2010 22:12:58 +0000 (15:12 -0700)]
split surface management from surface's buffers management

Change-Id: If3c5655d1231f8f0c49ba68f972b1b20c93b3f87

14 years agoclean-up client management.
Mathias Agopian [Thu, 3 Jun 2010 06:28:45 +0000 (23:28 -0700)]
clean-up client management.

simplified things a lot, the biggest change is that the concept
of "ClientID" is now gone, instead we simply use references.

Change-Id: Icbc57f80865884aa5f35ad0d0a0db26f19f9f7ce

14 years agoMerge "Watchdog now records kernel stacks when it fires" into froyo
Christopher Tate [Sat, 5 Jun 2010 01:06:07 +0000 (18:06 -0700)]
Merge "Watchdog now records kernel stacks when it fires" into froyo

14 years agoMerge "xhdpi" into froyo
Dianne Hackborn [Fri, 4 Jun 2010 23:32:01 +0000 (16:32 -0700)]
Merge "xhdpi" into froyo

14 years agoMerge "Make the DUN apn data secure." into froyo
Robert Greenwalt [Fri, 4 Jun 2010 22:55:09 +0000 (15:55 -0700)]
Merge "Make the DUN apn data secure." into froyo

14 years agoam 1e2e2aea: am 4b330921: Don\'t crash when low storage is encountered pre-boot compl...
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.

14 years agoam 4b330921: 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.

14 years agoMerge "Add support for heavy-weight applications." into kraken
Dianne Hackborn [Fri, 4 Jun 2010 20:30:32 +0000 (13:30 -0700)]
Merge "Add support for heavy-weight applications." into kraken

14 years agoam 2d743fe2: merge from open-source master
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

14 years agomerge from open-source master
The Android Open Source Project [Fri, 4 Jun 2010 18:07:49 +0000 (11:07 -0700)]
merge from open-source master

Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471

14 years agoMerge "Delete local references to avoid reference table overflow." into kraken
Jaikumar Ganesh [Fri, 4 Jun 2010 16:46:03 +0000 (09:46 -0700)]
Merge "Delete local references to avoid reference table overflow." into kraken

14 years agoMerge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." 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

14 years agoMerge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack...
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

14 years agoMerge "Add camera metering mode API." into kraken
Wu-cheng Li [Fri, 4 Jun 2010 05:32:05 +0000 (22:32 -0700)]
Merge "Add camera metering mode API." into kraken

14 years agoMerge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken
Brad Fitzpatrick [Thu, 3 Jun 2010 23:07:51 +0000 (16:07 -0700)]
Merge "Sprinkle new BlockGuard around SQLiteDatabase." into kraken

14 years agoam e896d416: am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of...
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.

14 years agoam 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be trans...
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.

14 years agoMerge "Changes to the prefetcher to allow for bursts of data to be transferred, hopef...
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

14 years agoMerge "Add better error handling for savePicture and restorePicture"
Romain Guy [Thu, 3 Jun 2010 21:26:21 +0000 (14:26 -0700)]
Merge "Add better error handling for savePicture and restorePicture"

14 years agoam b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description...
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.

14 years agoam 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
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.

14 years agoMerge "Doc change: Adjust security sandbox description." into froyo
Dirk Dougherty [Thu, 3 Jun 2010 19:57:06 +0000 (12:57 -0700)]
Merge "Doc change: Adjust security sandbox description." into froyo

14 years agoam c40209ac: am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType...
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.

14 years agoam 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be...
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.

14 years agoMerge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into...
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

14 years agoam ee7e6a78: merge from open-source master
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

14 years agomerge from open-source master
The Android Open Source Project [Thu, 3 Jun 2010 16:03:58 +0000 (09:03 -0700)]
merge from open-source master

Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9

14 years agoIssue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modificat...
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

14 years agoMerge "Fixed some minor bugs in MotionEvent recycling." into kraken
Jeff Brown [Wed, 2 Jun 2010 22:46:13 +0000 (15:46 -0700)]
Merge "Fixed some minor bugs in MotionEvent recycling." into kraken

14 years agoam 105e1c5a: am 6a297118: Merge "docs: a couple doc bug fixes" into froyo
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

14 years agoam 6a297118: Merge "docs: a couple doc bug fixes" into froyo
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

14 years agoMerge "docs: a couple doc bug fixes" into froyo
Scott Main [Wed, 2 Jun 2010 20:43:18 +0000 (13:43 -0700)]
Merge "docs: a couple doc bug fixes" into froyo

14 years agoam 1bd7597b: merge from open-source master
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

14 years agoam c8763858: merge from open-source master
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

14 years agomerge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 15:54:47 +0000 (08:54 -0700)]
merge from open-source master

Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb

14 years agomerge from open-source master
The Android Open Source Project [Wed, 2 Jun 2010 15:41:59 +0000 (08:41 -0700)]
merge from open-source master

Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6

14 years agoMerge "Improved error-handling in Rfc822Tokenizer"
Kenny Root [Wed, 2 Jun 2010 05:56:39 +0000 (22:56 -0700)]
Merge "Improved error-handling in Rfc822Tokenizer"

14 years agoam a6703415: am 85fb2066: Amend previous ndc commit
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

14 years agoam 85fb2066: 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

14 years agoam 847b82d8: am 89bc1395: Merge "Add more error checking for ndc" into froyo
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

14 years agoam 89bc1395: Merge "Add more error checking for ndc" into froyo
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.
  ...

14 years agoMerge "Add more error checking for ndc" into froyo
Kenny Root [Wed, 2 Jun 2010 02:55:01 +0000 (19:55 -0700)]
Merge "Add more error checking for ndc" into froyo

14 years agoMerge "fix a bug where fading in/out of opaque 32-bits windows wasn't working" into...
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

14 years agofix a bug where fading in/out of opaque 32-bits windows wasn't working
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.

14 years agoam 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year...
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.

14 years agoam de56c27d: Merge "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.

14 years agoMerge "Doc change: rename slide decks for sorting by year then quarter." into froyo
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

14 years agoam 1f5e8473: am a80331c4: Merge "Comment-only change to add documentation for FileObs...
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

14 years agoam a80331c4: Merge "Comment-only change to add documentation for FileObserver" into...
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

14 years agoMerge "Comment-only change to add documentation for FileObserver" into froyo
Dan Egnor [Tue, 1 Jun 2010 21:09:20 +0000 (14:09 -0700)]
Merge "Comment-only change to add documentation for FileObserver" into froyo

14 years agoam bce5edaf: am 862ad0e5: Merge "Doc change: updated dashboards stats." 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.

14 years agoam 862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
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.

14 years agoMerge "Doc change: updated dashboards stats." into froyo
Dirk Dougherty [Tue, 1 Jun 2010 18:04:20 +0000 (11:04 -0700)]
Merge "Doc change: updated dashboards stats." into froyo

14 years agomore clean-up in preparation of bigger changes
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

14 years agoFix a typo in Singleton<>
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.

14 years agoam 5c9d9949: am 6ee412d5: Also dump system process threads halfway through the watchd...
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

14 years agoam 6ee412d5: 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

14 years agoMerge "Avoid copying for input recording frames in CameraSource" into kraken
James Dong [Fri, 28 May 2010 17:53:09 +0000 (10:53 -0700)]
Merge "Avoid copying for input recording frames in CameraSource" into kraken

14 years agoMerge "Add video frame parameter." into kraken
Wu-cheng Li [Fri, 28 May 2010 11:34:13 +0000 (04:34 -0700)]
Merge "Add video frame parameter." into kraken

14 years agoMerge "more clean-up of Surfaceflinger's client management" 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

14 years agomore clean-up of Surfaceflinger's client management
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

14 years agoam 6cc13745: am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
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

14 years agoam 9eae9572: am 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables...
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.

14 years agoam 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
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

14 years agoam 9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory...
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.

14 years agoMerge "Fix typo in EastAsianWidth javadoc" into froyo
Kenny Root [Thu, 27 May 2010 19:04:34 +0000 (12:04 -0700)]
Merge "Fix typo in EastAsianWidth javadoc" into froyo