OSDN Git Service

android-x86/hardware-libhardware.git
11 years agoam 2a5c0e2a: Camera2: Tests: Skip stream tests /w formats that are not available...
Igor Murashkin [Thu, 10 Jan 2013 21:37:11 +0000 (13:37 -0800)]
am 2a5c0e2a: Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE

* commit '2a5c0e2a466fe5252cd12c0199d4868efcc83264':
  Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE

11 years agoam ff4d762c: Camera2: Tests: Add CLI arguments for disabling forking and changing...
Igor Murashkin [Thu, 10 Jan 2013 21:37:11 +0000 (13:37 -0800)]
am ff4d762c: Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE

* commit 'ff4d762c34e2f785a01f7d2253d746d0bcdc7aa4':
  Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE

11 years agoam afdd2b62: Camera2: Add a test for bursting 10 frames at a time /w manual exp contr...
Igor Murashkin [Thu, 10 Jan 2013 21:37:10 +0000 (13:37 -0800)]
am afdd2b62: Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE

* commit 'afdd2b621140f90c2df1a161ed36e42caa2d26da':
  Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE

11 years agoam 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:09 +0000 (13:37 -0800)]
am 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE

* commit '4ac84a428d05ce7963f201df7ca308acb88fd8d8':
  Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE

11 years agoam 919cf643: Camera2: Tests -- Fork each test before executing it: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:08 +0000 (13:37 -0800)]
am 919cf643: Camera2: Tests -- Fork each test before executing it: DO NOT MERGE

* commit '919cf643730fe7aacbbbaf014f2dfbf47521ecfa':
  Camera2: Tests -- Fork each test before executing it: DO NOT MERGE

11 years agoam 7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 21:37:07 +0000 (13:37 -0800)]
am 7e38f5fa: Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE

* commit '7e38f5faac9a8404bd13ea02cf136f1a69443715':
  Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE

11 years agoCamera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE
Igor Murashkin [Sat, 15 Dec 2012 00:33:46 +0000 (16:33 -0800)]
Camera2: Tests: Skip stream tests /w formats that are not available.: DO NOT MERGE

Change-Id: I0c0d6c639ee3b0fe625d0888cca4486da9e2bb98

11 years agoCamera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO...
Igor Murashkin [Tue, 11 Dec 2012 23:19:25 +0000 (15:19 -0800)]
Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE

Change-Id: I3c9133f74ef88dfdf10eb2c28760fc4acba8eb2f

11 years agoCamera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT...
Igor Murashkin [Fri, 7 Dec 2012 23:08:35 +0000 (15:08 -0800)]
Camera2: Add a test for bursting 10 frames at a time /w manual exp controls: DO NOT MERGE

Change-Id: Ib7c706a0d1f2d917d01397efe55b7e45035cb252

11 years agoCamera2: Tests: Future-alias select metadata symbols: DO NOT MERGE
Igor Murashkin [Thu, 10 Jan 2013 18:33:10 +0000 (10:33 -0800)]
Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE

Change-Id: I4010311d32a9c57790653b6c4ef0f51bfe24f853

11 years agoCamera2: Tests -- Fork each test before executing it: DO NOT MERGE
Igor Murashkin [Wed, 7 Nov 2012 01:02:54 +0000 (17:02 -0800)]
Camera2: Tests -- Fork each test before executing it: DO NOT MERGE

Use CAMERA2_TEST_FORKING_DISABLED=1 environment variable to override this
behavior (e.g. when wanting to attach gdb to the test app).

Change-Id: I3696243825901e5c7a7e4d0515831e76ae47ef4f

11 years agoCamera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE
Igor Murashkin [Mon, 5 Nov 2012 19:14:49 +0000 (11:14 -0800)]
Camera2: Automated tests for testing HAL2.0 interface: DO NOT MERGE

Change-Id: If5c922a0c0139b90c4781f022d80f7b9a0932e9e

11 years agoam e847651d: Merge "All tests should fail immediate to avoid SEGV"
Kenny Root [Tue, 4 Dec 2012 23:35:52 +0000 (15:35 -0800)]
am e847651d: Merge "All tests should fail immediate to avoid SEGV"

* commit 'e847651d45a1dd76004145d35346806acc6ef403':
  All tests should fail immediate to avoid SEGV

11 years agoMerge "All tests should fail immediate to avoid SEGV"
Kenny Root [Tue, 4 Dec 2012 22:42:04 +0000 (14:42 -0800)]
Merge "All tests should fail immediate to avoid SEGV"

11 years agoAll tests should fail immediate to avoid SEGV
Kenny Root [Tue, 20 Nov 2012 22:37:40 +0000 (14:37 -0800)]
All tests should fail immediate to avoid SEGV

Change-Id: I7ec2861c079357b708cb6242f0171672afd55e02

11 years agoam 48697f6d: Fix HWC documentation.
Mathias Agopian [Tue, 20 Nov 2012 23:39:48 +0000 (15:39 -0800)]
am 48697f6d: Fix HWC documentation.

* commit '48697f6dc249d1238243677de77d3a0eb6a17b3f':
  Fix HWC documentation.

11 years agoFix HWC documentation.
Mathias Agopian [Tue, 20 Nov 2012 23:23:25 +0000 (15:23 -0800)]
Fix HWC documentation.

Specify more clearly the behavior of compositionType
and hints.

Change-Id: I9abdccedd904b2fba783381bf9e2f8975ede8d67

11 years agoam bdcf8251: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 20:24:27 +0000 (12:24 -0800)]
am bdcf8251: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'bdcf82513c64690ee0de6a791fdf07b005ebd43d':

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Tue, 6 Nov 2012 20:17:39 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ibadcd642e060d8b828b13f7c748f0dfddf751906

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 1 Nov 2012 14:52:10 +0000 (07:52 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ieb5a478a87c7f3a3bb38e588c92e6768c047bb29

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 1 Nov 2012 01:34:07 +0000 (18:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 90b0fbd1: Shutdown audio pipe when closing input stream
Jean-Michel Trivi [Wed, 31 Oct 2012 21:00:49 +0000 (14:00 -0700)]
am 90b0fbd1: Shutdown audio pipe when closing input stream

* commit '90b0fbd13f97127e29ea565c09b64cc25ab6e9c9':
  Shutdown audio pipe when closing input stream

11 years agoShutdown audio pipe when closing input stream
Jean-Michel Trivi [Wed, 31 Oct 2012 02:03:22 +0000 (19:03 -0700)]
Shutdown audio pipe when closing input stream

Writing to the audio pipe for the remote submix is blocking, unless
 the audio output pipe is in shutdown mode. The playback thread
 could stay blocked on the write if the input stream has already
 been closed.
The change consists in shutting down the pipe also when the input
 stream gets closed. When the pipe is in this state, simulate
 timing in the write operation so we don't drain the output faster
 than realtime.

Bug 7424646

Change-Id: I5feb3be642b0ee7eef10dee0141308684ee9c811

11 years agoReconcile with jb-mr1-factory-release - do not merge
The Android Open Source Project [Fri, 12 Oct 2012 14:31:16 +0000 (07:31 -0700)]
Reconcile with jb-mr1-factory-release - do not merge

Change-Id: Ic82b52d2ef117f9c7820c88a8e44b81b25766f80

11 years agomerge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 15:19:20 +0000 (08:19 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 11 Oct 2012 15:05:17 +0000 (08:05 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I385ce51e37f3116c03d7de78036f4ed7ad883641

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 14:03:53 +0000 (07:03 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 20c7f50c: Support querying active record sources
Jean-Michel Trivi [Wed, 10 Oct 2012 23:34:11 +0000 (16:34 -0700)]
am 20c7f50c: Support querying active record sources

* commit '20c7f50cd5d60ee7d76f2f502866187992e7675b':
  Support querying active record sources

11 years agoSupport querying active record sources
Jean-Michel Trivi [Wed, 10 Oct 2012 19:23:17 +0000 (12:23 -0700)]
Support querying active record sources

Add support for querying whether there is currently a recording
 underway from the specified audio source.

Bug 7314859

Change-Id: I270f27eff4dcf1cc179089859a4c690140825ad1

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
The Android Open Source Project [Wed, 10 Oct 2012 16:44:59 +0000 (09:44 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ib081b6a0369bd5a597e53ee3a5551f5a63b67939

11 years agomerge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 15:55:55 +0000 (08:55 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:07:22 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 22:39:04 +0000 (15:39 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam c7545189: hwcomposer: Specify set() call error behavior.
Jamie Gennis [Tue, 9 Oct 2012 19:59:17 +0000 (12:59 -0700)]
am c7545189: hwcomposer: Specify set() call error behavior.

* commit 'c7545189c8b260bbaf09653407450418a3d1860b':
  hwcomposer: Specify set() call error behavior.

11 years agohwcomposer: Specify set() call error behavior.
Jamie Gennis [Tue, 9 Oct 2012 02:23:56 +0000 (19:23 -0700)]
hwcomposer: Specify set() call error behavior.

Bug: 7308829
Change-Id: Ibab6f0d2929860f02c17d6ffadb326fc0c333c4d

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 2 Oct 2012 16:18:43 +0000 (09:18 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I9bc9016d2ef2607e2a6fd596f9c6828872e7de6f

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 2 Oct 2012 13:59:45 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 3fb2be64: Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
Martijn Coenen [Mon, 1 Oct 2012 21:04:35 +0000 (14:04 -0700)]
am 3fb2be64: Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev

* commit '3fb2be64fffda871ab2d7a2bf8fb98a3cc8835a5':
  NFC HAL: Use a separate callback for data.

11 years agoMerge "NFC HAL: Use a separate callback for data." into jb-mr1-dev
Martijn Coenen [Mon, 1 Oct 2012 21:02:06 +0000 (14:02 -0700)]
Merge "NFC HAL: Use a separate callback for data." into jb-mr1-dev

11 years agoam 4d7640ae: Merge "bug 7253033 Add "exiting" state to remote audio submix module...
Jean-Michel Trivi [Mon, 1 Oct 2012 17:15:09 +0000 (10:15 -0700)]
am 4d7640ae: Merge "bug 7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev

* commit '4d7640ae5143ce991ee76abe0622eaf272a149de':
  bug 7253033 Add "exiting" state to remote audio submix module

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 1 Oct 2012 01:17:45 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge "bug 7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev
Jean-Michel Trivi [Sun, 30 Sep 2012 18:56:23 +0000 (11:56 -0700)]
Merge "bug 7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev

11 years agobug 7253033 Add "exiting" state to remote audio submix module
Jean-Michel Trivi [Sun, 30 Sep 2012 18:08:06 +0000 (11:08 -0700)]
bug 7253033 Add "exiting" state to remote audio submix module

Support receiving a parameter that sets the remote audio submix
 module in a state where the audio pipe will unblock any current
 write operation and not block anymore.

Change-Id: Ia3119cd79972afff0de24187dae627855a468ebf

11 years agoNFC HAL: Use a separate callback for data.
Martijn Coenen [Sun, 30 Sep 2012 18:06:22 +0000 (11:06 -0700)]
NFC HAL: Use a separate callback for data.

Bug: 7258325
Change-Id: I02d8ea1bdcb8ea6a9430e3dc286f5c2647277f72

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 30 Sep 2012 13:59:43 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam cecacd4e: Camera2: Change JPEG transport header
Alex Ray [Fri, 28 Sep 2012 19:49:25 +0000 (12:49 -0700)]
am cecacd4e: Camera2: Change JPEG transport header

* commit 'cecacd4e71c35fd50dbe1e9855cbab0faa17b550':
  Camera2: Change JPEG transport header

11 years agoCamera2: Change JPEG transport header
Alex Ray [Thu, 27 Sep 2012 22:48:23 +0000 (15:48 -0700)]
Camera2: Change JPEG transport header

The way buffers are passed to JPEG encoders makes it difficult to
account for a header offset.  This explains moving the header to
the end, and clarifies the required header packing.

Bug: 7108816
Change-Id: I569cd0cde37bd6fd7110fbc95d7fced9a55cff9c

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Mon, 24 Sep 2012 17:12:37 +0000 (10:12 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie1ba92a7c1b156a8a32deca7e2f55181f1c626eb

11 years agoam 3a90d596: Merge "Camera2: Add JPEG transport header" into jb-mr1-dev
Eino-Ville Talvala [Mon, 24 Sep 2012 15:25:53 +0000 (08:25 -0700)]
am 3a90d596: Merge "Camera2: Add JPEG transport header" into jb-mr1-dev

* commit '3a90d5964bc17ace1097e06a62d0410241c6c99c':
  Camera2: Add JPEG transport header

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 22 Sep 2012 16:42:02 +0000 (09:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge "Camera2: Add JPEG transport header" into jb-mr1-dev
Eino-Ville Talvala [Sat, 22 Sep 2012 01:33:50 +0000 (18:33 -0700)]
Merge "Camera2: Add JPEG transport header" into jb-mr1-dev

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 21 Sep 2012 13:59:54 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 919e1c45: Merge "Document reentrancy and error conditions" into jb-mr1-dev
Jesse Hall [Thu, 20 Sep 2012 21:13:53 +0000 (14:13 -0700)]
am 919e1c45: Merge "Document reentrancy and error conditions" into jb-mr1-dev

* commit '919e1c45b77b99c0215a53ab93d8032abb6d8c26':
  Document reentrancy and error conditions

11 years agoMerge "Document reentrancy and error conditions" into jb-mr1-dev
Jesse Hall [Thu, 20 Sep 2012 21:13:07 +0000 (14:13 -0700)]
Merge "Document reentrancy and error conditions" into jb-mr1-dev

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 20 Sep 2012 17:36:07 +0000 (10:36 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: If425346af9f905a95bbcdcc41035ce937280528c

11 years agoDocument reentrancy and error conditions
Jesse Hall [Thu, 20 Sep 2012 05:53:30 +0000 (22:53 -0700)]
Document reentrancy and error conditions

The hotplug callback is non-reentrant. The display config functions
return an error if called for a disconnected display type.

Change-Id: I52d11a53f9b30a7c39e98b0a9b07eb97a3d2becd

11 years agoCamera2: Add JPEG transport header
Eino-Ville Talvala [Wed, 19 Sep 2012 18:42:40 +0000 (11:42 -0700)]
Camera2: Add JPEG transport header

To simplify passing compressed JPEG data between the HAL and the
camera service, add a transport header for use with JPEG streams.

Bug: 7108816
Change-Id: I91060051f59032e66eaaab3ee9f651badd1f2ac0

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 19 Sep 2012 14:01:39 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 05f49546: Initial Bluetooth open source release
Andre Eisenbach [Tue, 18 Sep 2012 22:14:35 +0000 (15:14 -0700)]
am 05f49546: Initial Bluetooth open source release

* commit '05f49546a9c70805cbd77e71c7998652f91ec535':
  Initial Bluetooth open source release

11 years agoInitial Bluetooth open source release
Andre Eisenbach [Tue, 18 Sep 2012 19:15:26 +0000 (12:15 -0700)]
Initial Bluetooth open source release

Change-Id: I27bb95db854806d7deedaf6c622b17cb09f62f16

11 years agoam 97c262fc: Remote submix: fix sink/source reference count handling
Jean-Michel Trivi [Tue, 18 Sep 2012 17:33:21 +0000 (10:33 -0700)]
am 97c262fc: Remote submix: fix sink/source reference count handling

* commit '97c262fc848c407f316fd7fe2b468a540f3bc38f':
  Remote submix: fix sink/source reference count handling

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 18 Sep 2012 13:59:53 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoRemote submix: fix sink/source reference count handling
Jean-Michel Trivi [Tue, 18 Sep 2012 01:27:56 +0000 (18:27 -0700)]
Remote submix: fix sink/source reference count handling

The reference count on the strong pointers to the audio sink and
 source should be done on the object retrieved from the device
 structure, not by accessing the corresponding fields, as they
 can be cleared while reading or writing audio data.

Change-Id: I446a2c7bdcb0758b4013b0ad75450a15203fb9da

11 years agoam 35a2c167: Turn off logs in remote submix audio module
Jean-Michel Trivi [Mon, 17 Sep 2012 17:20:07 +0000 (10:20 -0700)]
am 35a2c167: Turn off logs in remote submix audio module

* commit '35a2c167b4ee090b5dd9779ecb40f82cdaf1c74d':
  Turn off logs in remote submix audio module

11 years agoTurn off logs in remote submix audio module
Jean-Michel Trivi [Mon, 17 Sep 2012 17:13:26 +0000 (10:13 -0700)]
Turn off logs in remote submix audio module

Change-Id: I61cd15534b1cd764b06f615569cdf02edbba909c

11 years agoam eec87706: Remote audio submix: blocking writes and sleeping reads.
Jean-Michel Trivi [Mon, 17 Sep 2012 17:03:01 +0000 (10:03 -0700)]
am eec87706: Remote audio submix: blocking writes and sleeping reads.

* commit 'eec87706d21fc0ac4ad10ede86943770b2533564':
  Remote audio submix: blocking writes and sleeping reads.

11 years agoRemote audio submix: blocking writes and sleeping reads.
Jean-Michel Trivi [Mon, 17 Sep 2012 16:59:42 +0000 (09:59 -0700)]
Remote audio submix: blocking writes and sleeping reads.

Change how the remote audio submix is handling piping audio
 through the pipe:
 - use a MonoPipe as audio sink for blocking writes,
 - use a MonoPipeReader as audio source for non blocking reads,
  and keep track of when recording started to align the
  time at which the in_read() call should return with the
  projected time of the recording duration.

Change-Id: I8b0f8c56a0486806101e272dfbf9c6d2d1c11112

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 16 Sep 2012 13:59:50 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge
Jean-Baptiste Queru [Sat, 15 Sep 2012 17:00:06 +0000 (10:00 -0700)]
Merge

Change-Id: I627bfcffe33110e091c6fa8d23d195c67d92156f

11 years agoDelete headers that have been moved
Jean-Baptiste Queru [Sat, 15 Sep 2012 16:24:58 +0000 (09:24 -0700)]
Delete headers that have been moved

Change-Id: I72e81a3ea789fe15d5a6cea281ebe43f82220669

11 years agoMerge "Layer flags won't change between prepare and set" into jb-mr1-dev
Mathias Agopian [Sat, 15 Sep 2012 00:41:13 +0000 (17:41 -0700)]
Merge "Layer flags won't change between prepare and set" into jb-mr1-dev

11 years agoLayer flags won't change between prepare and set
Jesse Hall [Sat, 15 Sep 2012 00:21:22 +0000 (17:21 -0700)]
Layer flags won't change between prepare and set

Change-Id: I0f25766976e4f783066e5b6fd917d1769906e43e

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 14 Sep 2012 21:10:33 +0000 (14:10 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 5404f9da: Initial NFC HAL for NCI controllers.
Martijn Coenen [Fri, 14 Sep 2012 20:59:33 +0000 (13:59 -0700)]
am 5404f9da: Initial NFC HAL for NCI controllers.

* commit '5404f9daaf2dabef5a650dd9947ad6991ab316cd':
  Initial NFC HAL for NCI controllers.

11 years agoInitial NFC HAL for NCI controllers.
Martijn Coenen [Wed, 12 Sep 2012 21:59:39 +0000 (17:59 -0400)]
Initial NFC HAL for NCI controllers.

Bug: 7123942
Change-Id: Ic64aa6477f2eb65b489b3be5d49ad21ccce63e2d

11 years agoam f3b13810: Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.
Eino-Ville Talvala [Fri, 14 Sep 2012 18:33:33 +0000 (11:33 -0700)]
am f3b13810: Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.

* commit 'f3b13810776cf5ecf070cf386977d1baab99b810':
  Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 14 Sep 2012 14:11:57 +0000 (07:11 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoCamera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.
Eino-Ville Talvala [Thu, 13 Sep 2012 23:32:14 +0000 (16:32 -0700)]
Camera2: Add CAMERA2_HAL_PIXEL_FORMAT_ZSL temporarily.

Until all HAL implementations move to the new gralloc format selection
scheme, define FORMAT_ZSL for indicating ZSL streams.

Bug: 6243944
Change-Id: I90249beaaca5da80c9464eedd6aa9d3648bb56cc

11 years agoam 41dd7314: Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev
Jean-Michel Trivi [Thu, 13 Sep 2012 20:38:03 +0000 (13:38 -0700)]
am 41dd7314: Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev

* commit '41dd73140ef8e6a2408a1d45190cbb82f380d720':
  Remote submix audio module: sleep less, log errors

11 years agoMerge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev
Jean-Michel Trivi [Thu, 13 Sep 2012 20:36:13 +0000 (13:36 -0700)]
Merge "Remote submix audio module: sleep less, log errors" into jb-mr1-dev

11 years agoRemote submix audio module: sleep less, log errors
Jean-Michel Trivi [Wed, 12 Sep 2012 02:19:08 +0000 (19:19 -0700)]
Remote submix audio module: sleep less, log errors

Neither write nor read are blocking, but write simulates
 timing by checking the clock between two writes and
 computing how long the next sleep should last.

Change-Id: I495ae6d44b0cf75a24fe4b70662cfac679049c67

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 13 Sep 2012 13:59:54 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam ea569c6f: Add outbuf fields for HWC 1.2 virtual displays
Jesse Hall [Thu, 13 Sep 2012 03:20:01 +0000 (20:20 -0700)]
am ea569c6f: Add outbuf fields for HWC 1.2 virtual displays

* commit 'ea569c6f94c83dcbd08f6ebd8ac7603b3f6a2048':
  Add outbuf fields for HWC 1.2 virtual displays

11 years agoAdd outbuf fields for HWC 1.2 virtual displays
Jesse Hall [Thu, 6 Sep 2012 23:57:12 +0000 (16:57 -0700)]
Add outbuf fields for HWC 1.2 virtual displays

Also rename HWC_DISPLAY_RESOLUTION_* to HWC_DISPLAY_WIDTH and
HWC_DISPLAY_HEIGHT for consistency.

Change-Id: Iabe6db0816f6f6eaaac24c3c9ae554177bcabf1d

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Wed, 12 Sep 2012 14:41:05 +0000 (07:41 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I190165deaba5ac670791cca5ab2da7d4aefd1d5f

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 11 Sep 2012 13:59:42 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 9b1abaab: update audio remote submix API revision
Eric Laurent [Mon, 10 Sep 2012 19:18:52 +0000 (12:18 -0700)]
am 9b1abaab: update audio remote submix API revision

* commit '9b1abaab145b7b631ac890f48c5440d6da8efdc7':
  update audio remote submix API revision

11 years agoupdate audio remote submix API revision
Eric Laurent [Mon, 10 Sep 2012 17:36:09 +0000 (10:36 -0700)]
update audio remote submix API revision

Update remote submix audio HAL API revision to 2.0
(new audio device enums).

Change-Id: I61d5faf498144002929e570ee50375b059fb17c5

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 9 Sep 2012 14:00:36 +0000 (07:00 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 8f59ea8d: Merge "audio: new audio devices enums" into jb-mr1-dev
Eric Laurent [Fri, 7 Sep 2012 21:53:46 +0000 (14:53 -0700)]
am 8f59ea8d: Merge "audio: new audio devices enums" into jb-mr1-dev

* commit '8f59ea8d1981026130b1b7e78029ce512a48b039':
  audio: new audio devices enums

11 years agoMerge "audio: new audio devices enums" into jb-mr1-dev
Eric Laurent [Fri, 7 Sep 2012 21:52:27 +0000 (14:52 -0700)]
Merge "audio: new audio devices enums" into jb-mr1-dev

11 years agoam 0e94a68b: Audio remote submix in hardware modules
Jean-Michel Trivi [Fri, 7 Sep 2012 18:50:18 +0000 (11:50 -0700)]
am 0e94a68b: Audio remote submix in hardware modules

* commit '0e94a68b1b7013c8a119411d8936373dce4167a9':
  Audio remote submix in hardware modules

11 years agoAudio remote submix in hardware modules
Jean-Michel Trivi [Fri, 7 Sep 2012 18:25:59 +0000 (11:25 -0700)]
Audio remote submix in hardware modules

Change-Id: I878c6f36685eff48a3cd51acceec812b61994945

11 years agoaudio: new audio devices enums
Eric Laurent [Tue, 28 Aug 2012 21:30:35 +0000 (14:30 -0700)]
audio: new audio devices enums

Changed audio device API version to 2.0 because of
new enums for audio input and output devices.

Removed implementations of get_supported_devices() in
stub and usb audio modules.

Change-Id: I09345d38929d931e5015e36d18259f5a5f950298

11 years agoam 67f41fbd: Add audio module for remote submix
Jean-Michel Trivi [Fri, 7 Sep 2012 17:04:36 +0000 (10:04 -0700)]
am 67f41fbd: Add audio module for remote submix

* commit '67f41fbd030c8eee16bd83a29ed4f62fbbca6f3d':
  Add audio module for remote submix

11 years agoAdd audio module for remote submix
Jean-Michel Trivi [Thu, 16 Aug 2012 20:56:03 +0000 (13:56 -0700)]
Add audio module for remote submix

New definitions of audio devices for remote submix: one representing
  a sink for writing the audio buffers that won't be played directly
  locally, another representing the audio source that can be read from
  to obtain the audio mix.

New audio hardware module encapsulating the submix loop functionality.
  Create a Pipe to serve as non-blocking audio ring buffer between
  the output device (the sink) and the input device (the source).

Change-Id: I527f4721a69ced0430a99ebba3b4db7d419f2bb2

11 years agoam 74a1cedd: Merge "audio effects: add audio source indication" into jb-mr1-dev
Eric Laurent [Fri, 7 Sep 2012 01:07:21 +0000 (18:07 -0700)]
am 74a1cedd: Merge "audio effects: add audio source indication" into jb-mr1-dev

* commit '74a1ceddb1634fdfb6de2770b201edc875b3dd34':
  audio effects: add audio source indication

11 years agoMerge "audio effects: add audio source indication" into jb-mr1-dev
Eric Laurent [Fri, 7 Sep 2012 01:04:40 +0000 (18:04 -0700)]
Merge "audio effects: add audio source indication" into jb-mr1-dev

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 6 Sep 2012 14:54:03 +0000 (07:54 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I67fc38f96c10401960d05d90a48c5cfeb7efbbda