OSDN Git Service

android-x86/frameworks-native.git
12 years agoam 65b8bbd3: Merge "Fix audio preprocessing library wrapper"
Eric Laurent [Mon, 13 Feb 2012 20:28:38 +0000 (12:28 -0800)]
am 65b8bbd3: Merge "Fix audio preprocessing library wrapper"

* commit '65b8bbd3c9842588702ac3a7860851f0496ed33c':
  Fix audio preprocessing library wrapper

12 years agoMerge "Fix audio preprocessing library wrapper"
Eric Laurent [Mon, 13 Feb 2012 20:27:27 +0000 (12:27 -0800)]
Merge "Fix audio preprocessing library wrapper"

12 years agoam 3be5c856: Revert "Test initialization of constant array exports."
Stephen Hines [Mon, 13 Feb 2012 20:00:20 +0000 (12:00 -0800)]
am 3be5c856: Revert "Test initialization of constant array exports."

* commit '3be5c8565154c9a6aa7abf0a0d61eaecf114b450':
  Revert "Test initialization of constant array exports."

12 years agoam dfb64e8c: Merge "Test initialization of constant array exports."
Stephen Hines [Mon, 13 Feb 2012 19:14:58 +0000 (11:14 -0800)]
am dfb64e8c: Merge "Test initialization of constant array exports."

* commit 'dfb64e8c805dcb371c747e675bf58b4c9a10e49f':
  Test initialization of constant array exports.

12 years agoMerge "Test initialization of constant array exports."
Stephen Hines [Mon, 13 Feb 2012 19:13:21 +0000 (11:13 -0800)]
Merge "Test initialization of constant array exports."

12 years agoam 760a36f2: Merge "Factor out and speed up permission-checking code"
Glenn Kasten [Mon, 13 Feb 2012 18:34:14 +0000 (10:34 -0800)]
am 760a36f2: Merge "Factor out and speed up permission-checking code"

* commit '760a36f20702351f64863e14b2ae15ad1199fdcf':
  Factor out and speed up permission-checking code

12 years agoam 072ec96a: Implement batching of input events on the consumer side.
Jeff Brown [Mon, 13 Feb 2012 18:34:12 +0000 (10:34 -0800)]
am 072ec96a: Implement batching of input events on the consumer side.

* commit '072ec96a4900d4616574733646ee46311cb5d2cb':
  Implement batching of input events on the consumer side.

12 years agoam 1adee11b: Optimize dispatcher for back-to-back finished signals.
Jeff Brown [Mon, 13 Feb 2012 18:34:09 +0000 (10:34 -0800)]
am 1adee11b: Optimize dispatcher for back-to-back finished signals.

* commit '1adee11b5e644c74a2ed40344f4836de3bd3ac56':
  Optimize dispatcher for back-to-back finished signals.

12 years agoam d1c48a05: Dispatch multiple touch events in parallel.
Jeff Brown [Mon, 13 Feb 2012 18:34:07 +0000 (10:34 -0800)]
am d1c48a05: Dispatch multiple touch events in parallel.

* commit 'd1c48a0525d05021036d4b14e937e221c0ae1318':
  Dispatch multiple touch events in parallel.

12 years agoam 8b4be560: Delete premature optimization.
Jeff Brown [Mon, 13 Feb 2012 18:33:59 +0000 (10:33 -0800)]
am 8b4be560: Delete premature optimization.

* commit '8b4be56030c3b8c93dfa45bccac7365f90f377ce':
  Delete premature optimization.

12 years agoMerge "Factor out and speed up permission-checking code"
Glenn Kasten [Mon, 13 Feb 2012 18:31:44 +0000 (10:31 -0800)]
Merge "Factor out and speed up permission-checking code"

12 years agoam 28b5cf1c: Delete dead code.
Jeff Brown [Mon, 13 Feb 2012 18:31:21 +0000 (10:31 -0800)]
am 28b5cf1c: Delete dead code.

* commit '28b5cf1c33df847d667b8974ba07c4157a49b48a':
  Delete dead code.

12 years agoam 59f1ff99: Delete latency tracking information in the Connection.
Jeff Brown [Mon, 13 Feb 2012 18:31:19 +0000 (10:31 -0800)]
am 59f1ff99: Delete latency tracking information in the Connection.

* commit '59f1ff99786e9d4a94270d6752aa3ca61e10f0a6':
  Delete latency tracking information in the Connection.

12 years agoam 9831d90d: Remove active connection tracking.
Jeff Brown [Mon, 13 Feb 2012 18:31:11 +0000 (10:31 -0800)]
am 9831d90d: Remove active connection tracking.

* commit '9831d90db8fba7e967d22b1f86eea1d6ac831541':
  Remove active connection tracking.

12 years agoam e9bb9be9: Simplify input target handling in the dispatcher.
Jeff Brown [Mon, 13 Feb 2012 18:31:08 +0000 (10:31 -0800)]
am e9bb9be9: Simplify input target handling in the dispatcher.

* commit 'e9bb9be9e46523ed901e38cfa83f4630f6496418':
  Simplify input target handling in the dispatcher.

12 years agoam cbee6d6e: Rewrite input transport using sockets.
Jeff Brown [Mon, 13 Feb 2012 18:31:06 +0000 (10:31 -0800)]
am cbee6d6e: Rewrite input transport using sockets.

* commit 'cbee6d6ede0499fb4a2c00bfc00d5db8d9ed5139':
  Rewrite input transport using sockets.

12 years agoam 3241b6b7: Remove batching and streaming from the input dispatcher.
Jeff Brown [Mon, 13 Feb 2012 18:31:03 +0000 (10:31 -0800)]
am 3241b6b7: Remove batching and streaming from the input dispatcher.

* commit '3241b6b7bd7eff64f0118ba2d636030e505a98f9':
  Remove batching and streaming from the input dispatcher.

12 years agoam d4762334: Merge "Process input events immediately when received."
Jeff Brown [Mon, 13 Feb 2012 18:28:49 +0000 (10:28 -0800)]
am d4762334: Merge "Process input events immediately when received."

* commit 'd4762334f103055b3aa59d97d027ace7c5950b6e':
  Process input events immediately when received.

12 years agoam 62d1058c: Merge "Remove the input dispatcher throttle."
Jeff Brown [Mon, 13 Feb 2012 18:28:47 +0000 (10:28 -0800)]
am 62d1058c: Merge "Remove the input dispatcher throttle."

* commit '62d1058cc972a8fcb7739547abd3298f5d98a9b1':
  Remove the input dispatcher throttle.

12 years agoImplement batching of input events on the consumer side.
Jeff Brown [Tue, 7 Feb 2012 22:46:57 +0000 (14:46 -0800)]
Implement batching of input events on the consumer side.

To support this feature, the input dispatcher now allows input
events to be acknowledged out-of-order.  As a result, the
consumer can choose to defer handling an input event from one
device (because it is building a big batch) while continuing
to handle input events from other devices.

The InputEventReceiver now sends a notification when a batch
is pending.  The ViewRoot handles this notification by scheduling
a draw on the next sync.  When the draw happens, the InputEventReceiver
is instructed to consume all pending batched input events, the
input event queue is fully processed (as much as possible),
and then the ViewRoot performs traversals as usual.

With these changes in place, the input dispatch latency is
consistently less than one frame as long as the application itself
isn't stalled.  Input events are delivered to the application
as soon as possible and are handled as soon as possible.  In practice,
it is no longer possible for an application to build up a huge
backlog of touch events.

This is part of a series of changes to improve input system pipelining.

Bug: 5963420

Change-Id: I42c01117eca78f12d66d49a736c1c122346ccd1d

12 years agoDispatch multiple touch events in parallel.
Jeff Brown [Tue, 7 Feb 2012 03:12:47 +0000 (19:12 -0800)]
Dispatch multiple touch events in parallel.

This change enables the input dispatcher to send multiple touch
events to an application without waiting for them to be acknowledged.
Essentially this is a variation on the old streaming optimization
but it is much more comprehensive.  Event dispatch will stall as
soon as 0.5sec of unacknowledged events are accumulated or a
focused event (such as a key event) needs to be delivered.

Streaming input events makes a tremendous difference in application
performance.  The next step will be to enable batching of input
events on the client side once again.

This is part of a series of changes to improve input system pipelining.

Bug: 5963420
Change-Id: I025df90c06165d719fcca7f63eed322a5cce4a78

12 years agoRewrite input transport using sockets.
Jeff Brown [Sat, 4 Feb 2012 04:11:27 +0000 (20:11 -0800)]
Rewrite input transport using sockets.

Since we will not longer be modifying events in place, we don't need
to use an ashmem region for input.  Simplified the code to instead
use a socket of type SOCK_SEQPACKET.

This is part of a series of changes to improve input system pipelining.

Bug: 5963420

Change-Id: I05909075ed8b61b93900913e44c6db84857340d8

12 years agoMerge "Process input events immediately when received."
Jeff Brown [Mon, 13 Feb 2012 18:26:40 +0000 (10:26 -0800)]
Merge "Process input events immediately when received."

12 years agoMerge "Remove the input dispatcher throttle."
Jeff Brown [Mon, 13 Feb 2012 18:26:33 +0000 (10:26 -0800)]
Merge "Remove the input dispatcher throttle."

12 years agoam 5a1f6fb4: Merge "Use ' for apostrophe in HTML encoding"
Marc Blank [Mon, 13 Feb 2012 18:21:58 +0000 (10:21 -0800)]
am 5a1f6fb4: Merge "Use ' for apostrophe in HTML encoding"

* commit '5a1f6fb4073ee4b27359faa950808a6eeac33a4c':
  Use ' for apostrophe in HTML encoding

12 years agoMerge "Use ' for apostrophe in HTML encoding"
Marc Blank [Mon, 13 Feb 2012 18:20:38 +0000 (10:20 -0800)]
Merge "Use ' for apostrophe in HTML encoding"

12 years agoam f96901f8: Merge "Add support for non-linear ramping of master volume adjustment"
Mike Lockwood [Sat, 11 Feb 2012 05:58:01 +0000 (21:58 -0800)]
am f96901f8: Merge "Add support for non-linear ramping of master volume adjustment"

* commit 'f96901f8ccf7e5bdb05bb22ca1b522c381f05043':
  Add support for non-linear ramping of master volume adjustment

12 years agoMerge "Add support for non-linear ramping of master volume adjustment"
Mike Lockwood [Sat, 11 Feb 2012 05:55:52 +0000 (21:55 -0800)]
Merge "Add support for non-linear ramping of master volume adjustment"

12 years agoam 8fdaf785: Merge "Change the signature of method addTextSource() in AwesomePlayer"
James Dong [Sat, 11 Feb 2012 01:59:22 +0000 (17:59 -0800)]
am 8fdaf785: Merge "Change the signature of method addTextSource() in AwesomePlayer"

* commit '8fdaf785e2624f355c525c1370fe0837969e5072':
  Change the signature of method addTextSource() in AwesomePlayer

12 years agoMerge "Change the signature of method addTextSource() in AwesomePlayer"
James Dong [Sat, 11 Feb 2012 01:57:16 +0000 (17:57 -0800)]
Merge "Change the signature of method addTextSource() in AwesomePlayer"

12 years agoam e4e04945: am 5caed1d9: am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode...
Wink Saville [Sat, 11 Feb 2012 01:03:21 +0000 (17:03 -0800)]
am e4e04945: am 5caed1d9: am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

* commit 'e4e04945e73ac06f7b39e07b9ba1d71339a2db49':

12 years agoam 5caed1d9: am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration...
Wink Saville [Sat, 11 Feb 2012 01:00:51 +0000 (17:00 -0800)]
am 5caed1d9: am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

* commit '5caed1d99b99a011501c532fbf970324ea82e13d':

12 years agoam 92881551: Merge "resolved conflicts for merge of e8b57fea to master"
Wink Saville [Sat, 11 Feb 2012 00:59:06 +0000 (16:59 -0800)]
am 92881551: Merge "resolved conflicts for merge of e8b57fea to master"

* commit '928815515481551c8318d5decc7009f00b82a511':
  Add OEM specific USB mode enumeration based on ro.bootmode property

12 years agoMerge "resolved conflicts for merge of e8b57fea to master"
Wink Saville [Sat, 11 Feb 2012 00:57:39 +0000 (16:57 -0800)]
Merge "resolved conflicts for merge of e8b57fea to master"

12 years agoresolved conflicts for merge of e8b57fea to master
Wink Saville [Sat, 11 Feb 2012 00:11:18 +0000 (16:11 -0800)]
resolved conflicts for merge of e8b57fea to master

Change-Id: I2ccf2b4cb73faadd0c8608cc21dda5db888d2937

12 years agoam ad8d175b: mAudioHwDevs and related cleanup
Glenn Kasten [Fri, 10 Feb 2012 23:39:17 +0000 (15:39 -0800)]
am ad8d175b: mAudioHwDevs and related cleanup

* commit 'ad8d175b405373b9614ad4278f274eae706df588':
  mAudioHwDevs and related cleanup

12 years agoam da639f54: Merge "Simplify ThreadBase::exit() aka requestExitAndWait"
Glenn Kasten [Fri, 10 Feb 2012 23:34:02 +0000 (15:34 -0800)]
am da639f54: Merge "Simplify ThreadBase::exit() aka requestExitAndWait"

* commit 'da639f54382d9342793a05aec59f179dd172bd57':
  Simplify ThreadBase::exit() aka requestExitAndWait

12 years agoam 6f5f9ce7: Merge "Disable HQ resamplers for now until qualified"
Glenn Kasten [Fri, 10 Feb 2012 23:33:59 +0000 (15:33 -0800)]
am 6f5f9ce7: Merge "Disable HQ resamplers for now until qualified"

* commit '6f5f9ce713b3ea58cbc71f3f4b02c2b694ce9dec':
  Disable HQ resamplers for now until qualified

12 years agoam d335c1cc: Merge "Move header declarations around for clarity"
Glenn Kasten [Fri, 10 Feb 2012 23:33:57 +0000 (15:33 -0800)]
am d335c1cc: Merge "Move header declarations around for clarity"

* commit 'd335c1cc4f9980d3fe2600876bd068ee5cb0002e':
  Move header declarations around for clarity

12 years agoam 3ebf95bb: Merge "Camel case readability & private disconnect(bool)"
Glenn Kasten [Fri, 10 Feb 2012 23:33:55 +0000 (15:33 -0800)]
am 3ebf95bb: Merge "Camel case readability & private disconnect(bool)"

* commit '3ebf95bb52c94d641fe8e49a7767dc73b1695ac7':
  Camel case readability & private disconnect(bool)

12 years agoam 2a67e1a6: Merge "Remove aliasing"
Glenn Kasten [Fri, 10 Feb 2012 23:33:52 +0000 (15:33 -0800)]
am 2a67e1a6: Merge "Remove aliasing"

* commit '2a67e1a6c037ea170958da754a1c8a5d4375ac06':
  Remove aliasing

12 years agoam 5bb3090a: Merge "Use mul from audioutils"
Glenn Kasten [Fri, 10 Feb 2012 23:33:49 +0000 (15:33 -0800)]
am 5bb3090a: Merge "Use mul from audioutils"

* commit '5bb3090a18ce7d5b8910b8394516efc5fba7b817':
  Use mul from audioutils

12 years agoam 52ee6350: Merge "Mark fields const if only set in constructor"
Glenn Kasten [Fri, 10 Feb 2012 23:33:47 +0000 (15:33 -0800)]
am 52ee6350: Merge "Mark fields const if only set in constructor"

* commit '52ee6350390ccbe000b9bf8c2637a968d7951c33':
  Mark fields const if only set in constructor

12 years agoMerge "Simplify ThreadBase::exit() aka requestExitAndWait"
Glenn Kasten [Fri, 10 Feb 2012 23:32:16 +0000 (15:32 -0800)]
Merge "Simplify ThreadBase::exit() aka requestExitAndWait"

12 years agoMerge "Disable HQ resamplers for now until qualified"
Glenn Kasten [Fri, 10 Feb 2012 23:31:54 +0000 (15:31 -0800)]
Merge "Disable HQ resamplers for now until qualified"

12 years agoMerge "Move header declarations around for clarity"
Glenn Kasten [Fri, 10 Feb 2012 23:31:07 +0000 (15:31 -0800)]
Merge "Move header declarations around for clarity"

12 years agoam c199e2c7: Merge changes Iefeba018,I1ce5b26d,Ie3f59793,Id3c5e1ec,I9063154a,Ib7bd88a...
Mike Lockwood [Fri, 10 Feb 2012 23:30:58 +0000 (15:30 -0800)]
am c199e2c7: Merge changes Iefeba018,I1ce5b26d,Ie3f59793,Id3c5e1ec,I9063154a,Ib7bd88a3,I20963df8,I01060b08,I7dc29739,I5c55a051,Ia07aa3c4,I3194ea94,I0dc37cce,Ic3a7bb65,I0a7eaecf,Ifa7b0614,Ice952c8e,Ia5abdb9e,Ifcb310f9,If5f4ec97,I4767690f,I79824179,I6e0f981e,Id60ae7f6

* commit 'c199e2c7e0f8895273fdd912c5c88495a8b30e35': (24 commits)
  EthernetDataTracker: Don't run DHCP or set network available until link is up
  Only send master volume or mute updates if the settings have changed
  Make AudioManager.adjustMasterVolume public and hidden
  Allow disabling network stats support in a resource overlay
  Restore persisted master volume if the media server restarts
  Don't allow changing master volume when muted
  Show the flags in package manager debugging.
  Modified the constructor of EndpointBase
  Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes
  Defer persisting master data to avoid excessive database writes
  Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.
  Remove reference counting and client death notification for master mute
  AudioService: Send broadcasts when master volume and mute state change
  Use the new get/putFlattenable methods on RpcData.
  Don't try to unmarshal void return types when there are out parameters being returned.
  AudioManager: Add wrapper methods for master volume support
  AudioManager: Add support for master mute
  NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi
  For events, require that the parameters be marked in.
  PhoneWindowManager: stifle warning that ITelephony service does not exist
  ...

12 years agoam 0ee0969f: Merge "UI automation service disconnected upon package change."
Svetoslav Ganov [Fri, 10 Feb 2012 23:30:52 +0000 (15:30 -0800)]
am 0ee0969f: Merge "UI automation service disconnected upon package change."

* commit '0ee0969ffb92d40c290c9da9bfc6f2cd5b1ba3aa':
  UI automation service disconnected upon package change.

12 years agoam 87a36a3b: Merge "Making shader compilation errors throw a Java exception."
Alex Sakhartchouk [Fri, 10 Feb 2012 23:30:48 +0000 (15:30 -0800)]
am 87a36a3b: Merge "Making shader compilation errors throw a Java exception."

* commit '87a36a3b291e78a612d2d08c14b245ff970080e0':
  Making shader compilation errors throw a Java exception.

12 years agoam f0451db4: Merge "Multi-user - wallpaper service"
Amith Yamasani [Fri, 10 Feb 2012 23:30:45 +0000 (15:30 -0800)]
am f0451db4: Merge "Multi-user - wallpaper service"

* commit 'f0451db4224e2b6360efa39cd65c88cd391f14e0':
  Multi-user - wallpaper service

12 years agoam 385f1caf: Merge "Move away from MediaDebug and use ADebug instead"
James Dong [Fri, 10 Feb 2012 23:30:39 +0000 (15:30 -0800)]
am 385f1caf: Merge "Move away from MediaDebug and use ADebug instead"

* commit '385f1cafa6e55d2f4b8846746fe7fe4e8755aedd':
  Move away from MediaDebug and use ADebug instead

12 years agoMerge "Camel case readability & private disconnect(bool)"
Glenn Kasten [Fri, 10 Feb 2012 23:30:15 +0000 (15:30 -0800)]
Merge "Camel case readability & private disconnect(bool)"

12 years agoMerge "Remove aliasing"
Glenn Kasten [Fri, 10 Feb 2012 23:29:35 +0000 (15:29 -0800)]
Merge "Remove aliasing"

12 years agoMerge "Use mul from audioutils"
Glenn Kasten [Fri, 10 Feb 2012 23:28:57 +0000 (15:28 -0800)]
Merge "Use mul from audioutils"

12 years agoam f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro...
Wink Saville [Fri, 10 Feb 2012 23:28:54 +0000 (15:28 -0800)]
am f11b6fbf: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

* commit 'f11b6fbfc8bab9a09e37ef9866c0da247474f4cf':

12 years agoMerge "Mark fields const if only set in constructor"
Glenn Kasten [Fri, 10 Feb 2012 23:28:45 +0000 (15:28 -0800)]
Merge "Mark fields const if only set in constructor"

12 years agoresolved conflicts for merge of cb66aec0 to graphics-dev
Jason Sams [Fri, 10 Feb 2012 23:27:26 +0000 (15:27 -0800)]
resolved conflicts for merge of cb66aec0 to graphics-dev

Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8

12 years agoMerge changes Iefeba018,I1ce5b26d,Ie3f59793,Id3c5e1ec,I9063154a,Ib7bd88a3,I20963df8...
Mike Lockwood [Fri, 10 Feb 2012 23:26:36 +0000 (15:26 -0800)]
Merge changes Iefeba018,I1ce5b26d,Ie3f59793,Id3c5e1ec,I9063154a,Ib7bd88a3,I20963df8,I01060b08,I7dc29739,I5c55a051,Ia07aa3c4,I3194ea94,I0dc37cce,Ic3a7bb65,I0a7eaecf,Ifa7b0614,Ice952c8e,Ia5abdb9e,Ifcb310f9,If5f4ec97,I4767690f,I79824179,I6e0f981e,Id60ae7f6

* changes:
  EthernetDataTracker: Don't run DHCP or set network available until link is up
  Only send master volume or mute updates if the settings have changed
  Make AudioManager.adjustMasterVolume public and hidden
  Allow disabling network stats support in a resource overlay
  Restore persisted master volume if the media server restarts
  Don't allow changing master volume when muted
  Show the flags in package manager debugging.
  Modified the constructor of EndpointBase
  Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes
  Defer persisting master data to avoid excessive database writes
  Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.
  Remove reference counting and client death notification for master mute
  AudioService: Send broadcasts when master volume and mute state change
  Use the new get/putFlattenable methods on RpcData.
  Don't try to unmarshal void return types when there are out parameters being returned.
  AudioManager: Add wrapper methods for master volume support
  AudioManager: Add support for master mute
  NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi
  For events, require that the parameters be marked in.
  PhoneWindowManager: stifle warning that ITelephony service does not exist
  AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set.
  Support putting Flattenables in Lists.
  Was generating code that uses the wrong RpcData.
  store the hw addr in the extraInfo field of ethernet NetworkInfos

12 years agoam 812c2ff6: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro...
Wink Saville [Fri, 10 Feb 2012 23:17:12 +0000 (15:17 -0800)]
am 812c2ff6: am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

* commit '812c2ff6312b25b9539399f38967f8a6ff40b733':
  Add OEM specific USB mode enumeration based on ro.bootmode property

12 years agoam 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode proper...
Wink Saville [Fri, 10 Feb 2012 23:14:40 +0000 (15:14 -0800)]
am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

* commit '197fe26940022be75384f4038dd789f446d33122':
  Add OEM specific USB mode enumeration based on ro.bootmode property

12 years agoam 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode proper...
Wink Saville [Fri, 10 Feb 2012 23:14:40 +0000 (15:14 -0800)]
am 197fe269: Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

* commit '197fe26940022be75384f4038dd789f446d33122':
  Add OEM specific USB mode enumeration based on ro.bootmode property

12 years agoMerge "UI automation service disconnected upon package change."
Svetoslav Ganov [Fri, 10 Feb 2012 23:13:26 +0000 (15:13 -0800)]
Merge "UI automation service disconnected upon package change."

12 years agoMerge "Add OEM specific USB mode enumeration based on ro.bootmode property" into...
Wink Saville [Fri, 10 Feb 2012 23:12:19 +0000 (15:12 -0800)]
Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1

12 years agoMerge "Making shader compilation errors throw a Java exception."
Alex Sakhartchouk [Fri, 10 Feb 2012 23:00:21 +0000 (15:00 -0800)]
Merge "Making shader compilation errors throw a Java exception."

12 years agoMerge "Multi-user - wallpaper service"
Amith Yamasani [Fri, 10 Feb 2012 22:34:52 +0000 (14:34 -0800)]
Merge "Multi-user - wallpaper service"

12 years agoMerge "Move away from MediaDebug and use ADebug instead"
James Dong [Fri, 10 Feb 2012 22:17:06 +0000 (14:17 -0800)]
Merge "Move away from MediaDebug and use ADebug instead"

12 years agoam 1137be1a: Follow raw pointer and sp<> conventions
Glenn Kasten [Fri, 10 Feb 2012 21:52:03 +0000 (13:52 -0800)]
am 1137be1a: Follow raw pointer and sp<> conventions

* commit '1137be1a686fdfc9f02c3aca7c33f28006df4742':
  Follow raw pointer and sp<> conventions

12 years agoMerge "Start implementing SurfaceTexture streaming into RS allocations."
Jason Sams [Fri, 10 Feb 2012 21:51:04 +0000 (13:51 -0800)]
Merge "Start implementing SurfaceTexture streaming into RS allocations."

12 years agoam 5dd4754f: Merge "No newline or space at end of ALOG format string"
Glenn Kasten [Fri, 10 Feb 2012 21:37:57 +0000 (13:37 -0800)]
am 5dd4754f: Merge "No newline or space at end of ALOG format string"

* commit '5dd4754f58e5e99f893749ab3bb3eda1de4cfbe7':
  No newline or space at end of ALOG format string

12 years agoMerge "No newline or space at end of ALOG format string"
Glenn Kasten [Fri, 10 Feb 2012 21:36:24 +0000 (13:36 -0800)]
Merge "No newline or space at end of ALOG format string"

12 years agoam c1513f42: Merge "Move declaration of stream_type_t up earlier"
Glenn Kasten [Fri, 10 Feb 2012 21:34:41 +0000 (13:34 -0800)]
am c1513f42: Merge "Move declaration of stream_type_t up earlier"

* commit 'c1513f42eecca54c385a6e63abe6ddcfff5c911c':
  Move declaration of stream_type_t up earlier

12 years agoam 80d0a9db: Merge "Fix typos in ALOG for pid vs tid"
Glenn Kasten [Fri, 10 Feb 2012 21:34:39 +0000 (13:34 -0800)]
am 80d0a9db: Merge "Fix typos in ALOG for pid vs tid"

* commit '80d0a9db5509c492a5c42f2efdd1a55b256d5838':
  Fix typos in ALOG for pid vs tid

12 years agoMerge "Move declaration of stream_type_t up earlier"
Glenn Kasten [Fri, 10 Feb 2012 21:33:31 +0000 (13:33 -0800)]
Merge "Move declaration of stream_type_t up earlier"

12 years agoMerge "Fix typos in ALOG for pid vs tid"
Glenn Kasten [Fri, 10 Feb 2012 21:33:02 +0000 (13:33 -0800)]
Merge "Fix typos in ALOG for pid vs tid"

12 years agoam 9fd2d6b1: Merge "Rename type() to streamType()"
Glenn Kasten [Fri, 10 Feb 2012 21:32:34 +0000 (13:32 -0800)]
am 9fd2d6b1: Merge "Rename type() to streamType()"

* commit '9fd2d6b1a65759ea123320353adb0f4685429b4d':
  Rename type() to streamType()

12 years agoMerge "Rename type() to streamType()"
Glenn Kasten [Fri, 10 Feb 2012 21:30:24 +0000 (13:30 -0800)]
Merge "Rename type() to streamType()"

12 years agoam 7aedd945: am 5b6f9bf5: (-s ours) am 8b6d7b06: am 650462bb: Import revised translat...
Eric Fischer [Fri, 10 Feb 2012 21:17:31 +0000 (13:17 -0800)]
am 7aedd945: am 5b6f9bf5: (-s ours) am 8b6d7b06: am 650462bb: Import revised translations.  DO NOT MERGE

* commit '7aedd945ed1727a4ad77f663baee1e32342d2ada':

12 years agoam c3b20274: am ffb2473b: (-s ours) am a2c92418: am 650462bb: Import revised translat...
Eric Fischer [Fri, 10 Feb 2012 21:17:29 +0000 (13:17 -0800)]
am c3b20274: am ffb2473b: (-s ours) am a2c92418: am 650462bb: Import revised translations.  DO NOT MERGE

* commit 'c3b2027498a40cb1e31bacbff4133b9079913161':
  Import revised translations.  DO NOT MERGE

12 years agoam 5b6f9bf5: (-s ours) am 8b6d7b06: am 650462bb: Import revised translations. DO...
Eric Fischer [Fri, 10 Feb 2012 21:15:26 +0000 (13:15 -0800)]
am 5b6f9bf5: (-s ours) am 8b6d7b06: am 650462bb: Import revised translations.  DO NOT MERGE

* commit '5b6f9bf51c13532acac782a23506cb0b783b8876':

12 years agoam ffb2473b: (-s ours) am a2c92418: am 650462bb: Import revised translations. DO...
Eric Fischer [Fri, 10 Feb 2012 21:15:23 +0000 (13:15 -0800)]
am ffb2473b: (-s ours) am a2c92418: am 650462bb: Import revised translations.  DO NOT MERGE

* commit 'ffb2473b3bd8a4986e41ff0a711e708656432eaf':
  Import revised translations.  DO NOT MERGE

12 years agoam 8b6d7b06: am 650462bb: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:13:58 +0000 (13:13 -0800)]
am 8b6d7b06: am 650462bb: Import revised translations.  DO NOT MERGE

* commit '8b6d7b063b5a94b59b4a1132763f4644ee1d8545':

12 years agoam a2c92418: am 650462bb: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:13:30 +0000 (13:13 -0800)]
am a2c92418: am 650462bb: Import revised translations.  DO NOT MERGE

* commit 'a2c9241869c14a058621668d65ca29fc8a867bbf':
  Import revised translations.  DO NOT MERGE

12 years agoam 650462bb: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:11:46 +0000 (13:11 -0800)]
am 650462bb: Import revised translations.  DO NOT MERGE

* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE

12 years agoam 650462bb: Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:11:45 +0000 (13:11 -0800)]
am 650462bb: Import revised translations.  DO NOT MERGE

* commit '650462bbfd6218c918cd9507ea0a33fa9a936f26':
  Import revised translations.  DO NOT MERGE

12 years agoam 16e19ce9: Merge "Clean up and expose LongSparseArray."
Dianne Hackborn [Fri, 10 Feb 2012 21:09:47 +0000 (13:09 -0800)]
am 16e19ce9: Merge "Clean up and expose LongSparseArray."

* commit '16e19ce9190791d5e45d71f2810529691e1f44be':
  Clean up and expose LongSparseArray.

12 years agoMerge "Clean up and expose LongSparseArray."
Dianne Hackborn [Fri, 10 Feb 2012 21:07:54 +0000 (13:07 -0800)]
Merge "Clean up and expose LongSparseArray."

12 years agoam aab002bd: Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce
Mike Lockwood [Fri, 10 Feb 2012 21:07:41 +0000 (13:07 -0800)]
am aab002bd: Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce

* commit 'aab002bdd4b86a6564d1a5fb4d6b8c6958eaf104':
  Make ActivityManagerService just kill apps when they crash on headless devices.
  Add support for disabling wallpaper service
  Fix merge problem
  Add the ability to pass float extras to AM.
  Adding a feature to indicate specific support for Bluetooth API.
  SystemServer: Add support for disabling AudioService and MountService

12 years agoam ab3ea05d: Merge "BatteryService: Don\'t fail to register native methods if kernel...
Mike Lockwood [Fri, 10 Feb 2012 21:05:14 +0000 (13:05 -0800)]
am ab3ea05d: Merge "BatteryService: Don\'t fail to register native methods if kernel power supply driver is missing"

* commit 'ab3ea05d63cb987639d03a0e2a8fdbc8e93c5c25':
  BatteryService: Don't fail to register native methods if kernel power supply driver is missing

12 years agoMerge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce
Mike Lockwood [Fri, 10 Feb 2012 21:05:13 +0000 (13:05 -0800)]
Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce

* changes:
  Make ActivityManagerService just kill apps when they crash on headless devices.
  Add support for disabling wallpaper service
  Fix merge problem
  Add the ability to pass float extras to AM.
  Adding a feature to indicate specific support for Bluetooth API.
  SystemServer: Add support for disabling AudioService and MountService

12 years agoMerge "BatteryService: Don't fail to register native methods if kernel power supply...
Mike Lockwood [Fri, 10 Feb 2012 21:03:24 +0000 (13:03 -0800)]
Merge "BatteryService: Don't fail to register native methods if kernel power supply driver is missing"

12 years agoam 598465d3: Merge "Import translations."
Eric Fischer [Fri, 10 Feb 2012 20:56:45 +0000 (12:56 -0800)]
am 598465d3: Merge "Import translations."

* commit '598465d374bc31a9d25536f9a41825c83369832f':
  Import translations.

12 years agoMerge "Import translations."
Eric Fischer [Fri, 10 Feb 2012 20:54:21 +0000 (12:54 -0800)]
Merge "Import translations."

12 years agoMerge "Import translations. DO NOT MERGE" into graphics-dev
Eric Fischer [Fri, 10 Feb 2012 20:53:09 +0000 (12:53 -0800)]
Merge "Import translations. DO NOT MERGE" into graphics-dev

12 years agoam 11ca3172: Merge changes Id747dc81,I3a74bd36,I2395527c,I86aeb066,Ic33d5766,I7bef739...
Mike Lockwood [Fri, 10 Feb 2012 19:51:52 +0000 (11:51 -0800)]
am 11ca3172: Merge changes Id747dc81,I3a74bd36,I2395527c,I86aeb066,Ic33d5766,I7bef7390,I4b797dd8,Id3622e9e,I28087c63,Ia1c6d909,I95a766dd,I6c0236c5,Ib71287f4,I4bcbefdc,I22a7cb8d,Ie24dbeaf,I7dbc4b45,I21d524ea,Iaa5bf14e,I7db766c3,I93fcaca2,I1eb72044,I05ffbe7c,Ifdfe2ff8,I

* commit '11ca31729c05a5c82aa298fb52ddebbe08a26627': (25 commits)
  Fix problems dispatching media button events on headless devices
  Add headless mode for running the framework without the surface flinger
  SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
  Load lockscreen.disabled setting on database create as well as upgrade
  SystemUI: Log an error instead of throwing an exception if navigation bar is enabled in tablet UI
  SettingsProvider: Add support for overriding lockscreen.disabled default value
  Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay
  Disable output processing when opening serial port.
  Update aidl for new Broker API.
  aidl: All flattenable types now must also be parcelable.
  Update aidl to new APIs.
  Suport RpcData as a parcelable type.
  Modified AIDL to support authentication
  Fix disconnect from wired ethernet issues.
  Fix PresenterClass by adding a _listener field
  add presenters to aidl.
  Add SerialPort.sendBreak()
  Generate fallthrough for unhandled actions in RPC methods.
  PhoneWindowManager: Disable boot progress dialog on headless builds
  Support custom flattenable types for RPC.
  ...

12 years agoMerge changes Id747dc81,I3a74bd36,I2395527c,I86aeb066,Ic33d5766,I7bef7390,I4b797dd8...
Mike Lockwood [Fri, 10 Feb 2012 19:50:10 +0000 (11:50 -0800)]
Merge changes Id747dc81,I3a74bd36,I2395527c,I86aeb066,Ic33d5766,I7bef7390,I4b797dd8,Id3622e9e,I28087c63,Ia1c6d909,I95a766dd,I6c0236c5,Ib71287f4,I4bcbefdc,I22a7cb8d,Ie24dbeaf,I7dbc4b45,I21d524ea,Iaa5bf14e,I7db766c3,I93fcaca2,I1eb72044,I05ffbe7c,Ifdfe2ff8,Ia8f767a2

* changes:
  Fix problems dispatching media button events on headless devices
  Add headless mode for running the framework without the surface flinger
  SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
  Load lockscreen.disabled setting on database create as well as upgrade
  SystemUI: Log an error instead of throwing an exception if navigation bar is enabled in tablet UI
  SettingsProvider: Add support for overriding lockscreen.disabled default value
  Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay
  Disable output processing when opening serial port.
  Update aidl for new Broker API.
  aidl: All flattenable types now must also be parcelable.
  Update aidl to new APIs.
  Suport RpcData as a parcelable type.
  Modified AIDL to support authentication
  Fix disconnect from wired ethernet issues.
  Fix PresenterClass by adding a _listener field
  add presenters to aidl.
  Add SerialPort.sendBreak()
  Generate fallthrough for unhandled actions in RPC methods.
  PhoneWindowManager: Disable boot progress dialog on headless builds
  Support custom flattenable types for RPC.
  SystemServer: Don't start A2DP service if audio is not enabled
  Add RpcData as a built-in marshallable type.
  Add the full suite of RpcData types.
  Checkpoint adding @home RPC support to aidl
  ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless

12 years agoam adf7c11e: Merge "Quick and dirty test app for new SerialPort API"
Mike Lockwood [Fri, 10 Feb 2012 19:44:33 +0000 (11:44 -0800)]
am adf7c11e: Merge "Quick and dirty test app for new SerialPort API"

* commit 'adf7c11e56e84531a3f4e9097cb05db663d7d246':
  Quick and dirty test app for new SerialPort API

12 years agoam 1e11c651: Merge "New Serial Manager API:"
Mike Lockwood [Fri, 10 Feb 2012 19:44:29 +0000 (11:44 -0800)]
am 1e11c651: Merge "New Serial Manager API:"

* commit '1e11c6519a5b657ad6af4369b8580fbe681ebe0e':
  New Serial Manager API:

12 years agoMerge "Quick and dirty test app for new SerialPort API"
Mike Lockwood [Fri, 10 Feb 2012 19:41:56 +0000 (11:41 -0800)]
Merge "Quick and dirty test app for new SerialPort API"

12 years agoMerge "New Serial Manager API:"
Mike Lockwood [Fri, 10 Feb 2012 19:41:41 +0000 (11:41 -0800)]
Merge "New Serial Manager API:"

12 years agoam d262744b: Merge "Some cruft removal."
Dianne Hackborn [Fri, 10 Feb 2012 19:17:01 +0000 (11:17 -0800)]
am d262744b: Merge "Some cruft removal."

* commit 'd262744b7e4fd9e01a9a0a5d70927328e9391bf9':
  Some cruft removal.