summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove HAVE_UNWIND_CONTEXT_STRUCT from hardware/ti/omap4xxx."HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-14.1cm-14.0cm-13.0Elliott Hughes2015-01-071-6/+0
|\
| * Remove HAVE_UNWIND_CONTEXT_STRUCT from hardware/ti/omap4xxx.Elliott Hughes2015-01-071-6/+0
|/ | | | Change-Id: I2984f3958a7fbf1c3cc76eead3ab72fed7da22a3
* Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-166-6/+0
|\
| * Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-166-6/+0
|/ | | | | Bug: 18675947 Change-Id: Ib4061f5d92bb04fa8167e02767edc3c5a5632474
* am 734ca303: am c32caab8: am 0fbe7ecf: libexif is now libjheadstaging/cm-12.0-cafMarco Nelissen2014-04-300-0/+0
|\ | | | | | | * commit '734ca3030210e23192ce94a5b35b9ac1a0ad0934':
| * am c32caab8: am 0fbe7ecf: libexif is now libjheadMarco Nelissen2014-04-300-0/+0
| |\ | | | | | | | | | * commit 'c32caab84ff9edc1489ed6c8079c7d252caafc4d':
| | * am 0fbe7ecf: libexif is now libjheadMarco Nelissen2014-03-071-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '0fbe7ecfb0a526c02b774208fa00e0cba19d13a4': libexif is now libjhead
* | | | am df1b83e1: am 0fbe7ecf: libexif is now libjheadMarco Nelissen2014-03-070-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'df1b83e11a7694ec7c5a6fdf5617a966afcdf232': libexif is now libjhead
| * | | am 0fbe7ecf: libexif is now libjheadMarco Nelissen2014-03-071-1/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | * commit '0fbe7ecfb0a526c02b774208fa00e0cba19d13a4': libexif is now libjhead
| | * libexif is now libjheadMarco Nelissen2014-03-061-1/+1
| | | | | | | | | | | | | | | b/12203995 Change-Id: I78c3eae1dc3a3e37da182513078749ad83d6d004
* | | libexif is now libjheadMarco Nelissen2013-12-191-1/+1
|/ / | | | | | | Change-Id: I78c3eae1dc3a3e37da182513078749ad83d6d004
* | Merge "camera: do not use GNU old-style field designators"Nick Kralevich2013-10-311-18/+13
|\ \ | |/ |/|
| * camera: do not use GNU old-style field designatorssynergydev2013-11-021-18/+13
|/ | | | | | | | | Avoiding the use of GNU extensions improves portability Fixes the following: error: use of GNU old-style field designator extension Change-Id: Ic1bf7e44b3bf0c9b30c8c950b02ad71452a0bd8f
* camera: Handle capture request in AF runAlex Ray2013-04-221-0/+6
| | | | | Bug: 8140969 Change-Id: I1e1889434d57714cdb0c10929609eade299c1ea9
* Add liblogYing Wang2013-04-094-3/+6
| | | | | Bug: 8580410 Change-Id: If897b4d39c67a49aa590b1692d26db794a53c2a3
* cleanupJean-Baptiste Queru2013-03-283-40/+0
| | | | Change-Id: Id710a5b742eb81351f0ef14a331824293b4df522
* Fix native test's calls to camera libraryEino-Ville Talvala2013-03-222-6/+21
| | | | Change-Id: I816bd24669229c3ff3a8397c516080c7d409455f
* remove Surface uses in favor of IGraphicBufferProducerMathias Agopian2013-03-121-2/+2
| | | | Change-Id: I0d52884fbe80aa7f29f71bfbedd62162601a1360
* am 32f08e77: Merge "Panda: Set lcd_xpy to 1 if the x/y res and dimensions ↵Jean-Baptiste Queru2012-12-031-2/+9
|\ | | | | | | | | | | | | are not set" * commit '32f08e77913e7938f5982276a3c44d93d8091498': Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not set
| * Merge "Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not set"Jean-Baptiste Queru2012-12-031-2/+9
| |\
| | * Panda: Set lcd_xpy to 1 if the x/y res and dimensions are not setDan Murphy2012-12-031-2/+9
| |/ | | | | | | | | | | | | | | | | | | | | Since the panda uses HDMI and DVI only there is no setting to indicate the x/y res or dimensions. There fore if these values are not set in the kernel set the lcd_xpy to 1 Change-Id: I538eb0fc059daebfa3fe125cbdf0b70eb51f1616 Signed-off-by: Dan Murphy <dmurphy@ti.com>
* | am 015960eb: am 707e301d: Revert "CameraHal: Sync AF cancel with incoming ↵Eino-Ville Talvala2012-11-082-53/+23
|\| | | | | | | | | | | | | OMX events" * commit '015960eb1f62f682432137441737d8440a871536': Revert "CameraHal: Sync AF cancel with incoming OMX events"
| * am 707e301d: Revert "CameraHal: Sync AF cancel with incoming OMX events"Eino-Ville Talvala2012-11-082-53/+23
| |\ | | | | | | | | | | | | * commit '707e301de8b52780a7f0e88e6f25ac919c23671f': Revert "CameraHal: Sync AF cancel with incoming OMX events"
| | * Revert "CameraHal: Sync AF cancel with incoming OMX events"Eino-Ville Talvala2012-11-072-53/+23
| | | | | | | | | | | | | | | | | | This reverts commit b96dffd40e25d29a61f9fbd7f2e5968b5335b957. Bug: 7495861
* | | am 646723c0: am b96dffd4: CameraHal: Sync AF cancel with incoming OMX eventsEmilian Peev2012-11-052-23/+53
|\| | | | | | | | | | | | | | * commit '646723c06120cc9344463f6b3f001178e606838f': CameraHal: Sync AF cancel with incoming OMX events
| * | am b96dffd4: CameraHal: Sync AF cancel with incoming OMX eventsEmilian Peev2012-11-052-23/+53
| |\| | | | | | | | | | | | | * commit 'b96dffd40e25d29a61f9fbd7f2e5968b5335b957': CameraHal: Sync AF cancel with incoming OMX events
| | * CameraHal: Sync AF cancel with incoming OMX eventsEmilian Peev2012-10-232-23/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cancel AF is made to wait on incoming OMX events when AF status changes. An AF timeout is introduced in order not to block this call indefinitely. - Additionally calls to 'autoFocus()' will immediately trigger AF callbacks if fixed modes are being used. Bug: 6949572 Change-Id: I5f240fb6fc7fe53aecaff76d75d608dd522c1e27 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* | | Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-301-1/+0
| | | | | | | | | | | | | | | Bug: 6654403 Change-Id: I56fbf4925d64670c9d0ce7c8ba78ab6462abee2d
* | | Add embedded omap4 targetMike Lockwood2012-10-261-0/+22
|/ / | | | | | | | | Change-Id: I901fb32c51d05ccc6dbff8f4de17364efac12da3 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | Merge "Add conditional on TARGET_BOARD_PLATFORM_VARIANT" into jb-mr1-aah-devMike J. Chen2012-10-161-1/+6
|\ \ | |/ |/|
| * Add conditional on TARGET_BOARD_PLATFORM_VARIANTMike J. Chen2012-10-151-1/+6
| | | | | | | | | | | | | | | | | | | | Only build if TARGET_BOARD_PLATFORM_VARIANT is not set. Boards (like phantasm) will set TARGET_BOARD_PLATFORM_VARIANT when they want to use a different set of hardware files (like hardware/ti/omap4-aah) and not the ones in this project. Change-Id: I2cd921a97ae66b08494c65e038022fa3c739de72 Signed-off-by: Mike J. Chen <mjchen@google.com>
* | CameraHal: Avoid race condition during recording stopEmilian Peev2012-10-151-2/+2
|/ | | | | | | | | | | | | | | | - A race condition is possible when recording is stopped. 'BaseCameraAdapter::stopVideoCapture()' is clearing 'mVideoBuffersAvailable'. A delayed video frame from 'AppCallbackNotifier' can return afterwards though and then try to query the already empty 'KeyedVector'. This will result in a segfault. Solution is to move the vector reset away from 'stopVideoCapture()' and in to 'startVideoCapture()' where it is needed. Bug: 7021214 Change-Id: Ic234189b49e35c990b3af70bd713a12cb762362c Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* HWC field was renamedJesse Hall2012-09-121-3/+3
| | | | Change-Id: If08258776db427c45d9ba70cfa79f4d290398ca6
* Use new surface flinger API.Jeff Brown2012-08-241-2/+2
| | | | Change-Id: I90a00bd284a5d800f0f0eac5616ffa9ce14303c0
* Update for cleanups in hwc interfaceJesse Hall2012-08-221-15/+13
| | | | Change-Id: I7851cd5ca7cd826b3b4b35e6df90ce1e2a9f4327
* Update the omap4xxx HWC to use the 1.0 interfacesAndy McFadden2012-08-211-30/+82
| | | | | | | | | | Switch to HWC_DEVICE_API_VERSION_1_0 and the corresponding structures. This change removes special-case handling for Panda, which was using v0.2. This will likely break the Panda display. Change-Id: Id9ba6910ae2285d116f697bfa5af2c1f6b022ce0
* Merge "Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"" into jb-mr1-devJames Dong2012-08-030-0/+0
|\
| * Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries"Edwin Wong2012-08-032-34/+1
| | | | | | | | | | | | This reverts commit 6e18d140dfd80193121abf35764b8dad2f369041 Change-Id: Idcedbc1cc744c42c06e5c731b3c60355414e6add
* | Merge "Fix the build." into jb-mr1-devJim Miller2012-08-032-34/+1
|\ \
| * | Fix the build.Jim Miller2012-08-032-34/+1
| |/ | | | | | | | | | | | | | | Revert "Revert Widevine 6.0.0 -> 4.5.0 libraries" This reverts commit 6e18d140dfd80193121abf35764b8dad2f369041 Change-Id: Ia2cb66fc1f88298df675b9085b16c83558dede62
* | Merge "Revert Widevine 6.0.0 -> 4.5.0 libraries" into jb-mr1-devEdwin Wong2012-08-032-1/+34
|\|
| * Revert Widevine 6.0.0 -> 4.5.0 librariesEdwin Wong2012-08-032-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | Includes Widevine libraries Version 4.5.0.7809 Also fixed samplePlayer's MediaCodec mode not running and WVDrmInfoRequestStatusKey returning incorrect value. Change-Id: I1d7df9cf3935d7fec143e326f142e974979cc69b related-to-bug: 6929628 related-to-bug: 6833718 related-to-bug: 6889322
* | am 53835e97: Merge "OMAP4:Panda: Use old hwcomposer API version for panda"Jean-Baptiste Queru2012-08-021-1/+7
|\ \ | |/ |/| | | | | * commit '53835e97845edf78d513010ae4faa8fc467f0a6c': OMAP4:Panda: Use old hwcomposer API version for panda
| * Merge "OMAP4:Panda: Use old hwcomposer API version for panda"Jean-Baptiste Queru2012-08-021-1/+7
| |\
| | * OMAP4:Panda: Use old hwcomposer API version for pandaDan Murphy2012-08-021-1/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hwcomposer for OMAP4 is generic to the all OMAP4 processors. Panda does not support Vsync protocal which is expected when the HAL declares an API support level of 0.3. Therefore indicate to the upper layers that if the product is panda then only API level 0.2 is supported which then forces upper layers to fake the vsync signal Change-Id: I22a39f55ea017ced25424556ffc95b099d0a2781 Signed-off-by: Dan Murphy <dmurphy@ti.com>
* | Merge "Remove libdrmdecrypt from AOSP build."Fred2012-07-172-30/+0
|\ \
| * | Remove libdrmdecrypt from AOSP build.Fred2012-07-072-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all boards that use the omap4 chipset need to have the drm library. In particular, the panda does not. The libdrmdecrypt make file was moved from hardware/ti/omap4xxx, to vendor/ti/proprietary. The directory libdrmdecrypt was removed in this change, and added in change Icbeb6c5c. The dependency on libdrmdecrypt was removed from omap4.mk and added to tuna_common.mk in change Ia1019321. Change-Id: Iaad4d1122809ad67869d7515c5c5009a048bb1c2
* | | Fixup ion change to old libraryRebecca Schultz Zavin2012-07-096-6/+131
|/ / | | | | | | | | | | | | Missed a few places that needed updating Change-Id: I1a483d9d85858e752df0f1d970559fcac6695856 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* | am 692b0d66: Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
|\| | | | | | | * commit '692b0d6601761e7b1c1f8cb9581358d77551d4dd':
| * Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
| |\ | | | | | | | | | Change-Id: I4deb64bb027bc5216883f21f97502ae54c97fd39
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 14:27:13 +0000