summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audio: allow compiling for 64-bitColin Cross2014-04-181-2/+2
| | | | | | | | Set -Wno-unused-parameter, which makes the directory warnings-clean on 32-bit and 64-bit. Remove LOCAL_32_BIT_ONLY. Change-Id: If0c0135e57935d785a0f36b7d5187ac567c7e21c
* Merge "Camera2 Test: fix test criteria for exposure time"Eino-Ville Talvala2014-03-291-6/+9
|\
| * Camera2 Test: fix test criteria for exposure timeGaurav Batra2014-03-281-6/+9
|/ | | | | | Add some tolerance while testing requested exposure times against capture times. Change-Id: I609e7819cde8ee466e152775781a6542e6686ded
* Merge "Audio HALs are 32-bit only"Glenn Kasten2014-03-133-0/+4
|\
| * Audio HALs are 32-bit onlyGlenn Kasten2014-03-133-0/+4
|/ | | | Change-Id: I97eef87849312610d82bc3f82e168bb40604e646
* Merge "Fix PAN control callback definition to match what bluedroid is doing."Matthew Xie2014-03-101-2/+2
|\
| * Fix PAN control callback definition to match what bluedroid is doing.Sharvil Nanavati2014-02-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | There's a discrepancy in the order of arguments between the interface and the implementation. bluedroid swaps the |error| and |local_role| arguments when calling back so this change redefines the interface for consistency. http://b/12853951 Change-Id: I0ccfc6d6d2002d647d484ab7f53744863b569502
* | Merge "gralloc: dont hardcode 32bpp as RGBX"Jesse Hall2014-03-061-1/+1
|\ \
| * | gralloc: dont hardcode 32bpp as RGBXBernhard Rosenkraenzer2014-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | Not every 32bpp is in RGBX format. Change-Id: Ic3c6a0cbf475bff2fe2fc4b023c6bc58e4fc295e Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
* | | Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"Greg Hackmann2014-03-061-1/+1
|\ \ \
| * | | gralloc: make private_handle_t layout consistent on 32/64-bitGreg Hackmann2014-03-031-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | private_handle_t's memory layout must be consistent between the 32-bit and 64-bit gralloc, in case buffers are passed between processes. Replace the (variably sized) uintptr_t base with a fixed size uint64_t, and enforce 8-byte alignment for architectures where uint64_t alignment varies between 32-bit and 64-bit. Change-Id: I06cb31d4b9620ea18e5b50d3a3142b5adb2d2a14 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | Merge "Move libhardware of <asm/page.h>."Elliott Hughes2014-02-251-5/+1
|\ \ \ | |/ / |/| |
| * | Move libhardware of <asm/page.h>.Elliott Hughes2014-02-241-5/+1
|/ / | | | | | | Change-Id: I7cf9d04828f19b8d7d1d3b8948bef580b101b10c
* | Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"Colin Cross2014-02-161-0/+5
|\ \
| * | Use /(vendor|system)/lib64/hw for 64-bit HAL librariesDan Willemsen2014-02-161-0/+5
|/ / | | | | | | Change-Id: Ib905e079b1e88977fb3408671301904c58f35d3c
* | Merge "Try using goldfish_pipe as the device name"David Turner2014-02-141-0/+2
|\ \
| * | Try using goldfish_pipe as the device nameOctavian Purdila2014-01-291-0/+2
| |/ | | | | | | | | | | | | | | | | | | The upstream goldfish_pipe driver uses goldfish_pipe as a name instead of qemu_pipe. Try using this name if the old name (qemu_pipe) fails. For: ABIT-15 Change-Id: I8c6178faf27b1cdb31cc4343cf1af396e929f7e4 Signed-off-by: Octavian Purdila <octavian.purdila@intel.com> Signed-off-by: Jun Tian <jun.j.tian@intel.com>
* | Merge "AArch64: Calculate private_handle_t's numInts"Greg Hackmann2014-02-131-3/+5
|\ \
| * | AArch64: Calculate private_handle_t's numIntsAshok Bhat2014-02-071-3/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | A constant sNumInts with a value of 6 was being assigned to the numInts attribute in the private_handle_t constructor, and was also used in the validate method. That constant value is appropriate for 32-bit systems but is not appropriate for a 64-bit system where uintptr_t used for base attribute will be 64-bit. sNumInts is now changed to a static inline function that calculates numInts. Change-Id: I482ddb5915c9ff55fb2e2a87887a0ec2dc2299ed Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | Merge "gralloc: fix warnings"Colin Cross2014-02-064-11/+11
|\ \ | |/ |/|
| * gralloc: fix warningsColin Cross2014-02-054-11/+11
|/ | | | | | | Fix LP64 pointer casting warnings, unused parameters, and turn off missing initializer warnings. Change-Id: Idb70f4534282fed64ae81cb1e154d3f5b93091b0
* Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to ↵Colin Cross2014-01-2812-13/+13
|\ | | | | | | LOCAL_MODULE_RELATIVE_PATH"
| * hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-2412-13/+13
|/ | | | | | | LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
* Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."David Turner2014-01-234-1/+234
|\
| * Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.Vincent Becker2014-01-134-1/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android's implementation of vibrator needs to be done inside a hardware module, so that it can make a vendor implementation possible. Hw module's name becomes vibrator.default.so. This change is related to other changes in: - frameworks/base - hardware/libhardware_legacy - device/generic/goldfish - platform/build Change-Id: I844279f5535289f079d412fdc44c5cb3c9c1130c Author: Vincent Becker <vincentx.becker@intel.com> Signed-off-by: Vincent Becker <vincentx.becker@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: David Wagner <david.wagner@intel.com> Author-tracking-BZ: 49760 94611
* | Merge "hardware: fix check for ro.hardware.<class> property"Colin Cross2014-01-141-1/+1
|\ \
| * | hardware: fix check for ro.hardware.<class> propertyColin Cross2014-01-131-1/+1
|/ / | | | | | | | | | | | | Replace == with >, property_get returns the length of the property if found. Change-Id: I4b8fe8f8dba578112d21eee5dc64be4aa27f3bfb
* | Merge "hardware: add ro.hardware.<class> to HAL loading properites list"Colin Cross2014-01-021-28/+44
|\ \ | |/ |/|
| * hardware: add ro.hardware.<class> to HAL loading properites listColin Cross2014-01-021-28/+44
|/ | | | | | | | | | | | | | Try to load a HAL determined by ro.hardware.<class> first before falling back to hardware, board, platform, arch, and default. This is intended to be used to support multiple hardware variants from the same source. For example, a single build that supports two gps chips, gps001 and gpsb, could use /factory/factory.prop to set ro.hardware.gps=gps001 or ro.hardware.gps=gpsb, which would load gps.gps001.so or gps.gpsb.so. Two separate builds from the same source could use PRODUCT_PROPERTY_OVERRIDES to set the properties. Change-Id: I1ac46c21ceb27ceb5165e8c44e9373e9c5d4e34e
* Merge commit 'eed5dceb4a0bc02f50f236ab191d30c49c58f610' into HEADThe Android Open Source Project2013-12-052-13/+38
|\
| * am 7ccf148f: Update HWC documentation for virtual displaysJesse Hall2013-11-131-9/+23
| |\ | | | | | | | | | | | | * commit '7ccf148f5066ceb1a161f0d7a7d66f75c6e8d420': Update HWC documentation for virtual displays
| | * Update HWC documentation for virtual displaysJesse Hall2013-11-131-9/+23
| | | | | | | | | | | | | | | Bug: 8316155 Change-Id: I56598551b07082bfff90df160b103a4158e8c8c9
| * | am af822c43: Merge "gralloc: do not use GNU old-style field designators"Nick Kralevich2013-11-061-20/+20
| |\ \ | | | | | | | | | | | | | | | | * commit 'af822c43cf144a991db49d8c25068d054265ae37': gralloc: do not use GNU old-style field designators
| * \ \ am b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devicesZhijun He2013-10-291-4/+15
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'b44ff6508bbcb8df751b5815dd4dfbd4cae252f7': Camera2 Test: Skip CameraModuleTest for HAL V1 devices
| | * | Camera2 Test: Skip CameraModuleTest for HAL V1 devicesZhijun He2013-10-281-4/+15
| | | | | | | | | | | | | | | | | | | | Bug: 10971907 Change-Id: Ia3aa0e370d7eb5de6bb1fb7ff48a71ea5605fa17
* | | | Merge "gralloc: delete unused mutex declaration"Rom Lemarchand2013-11-261-4/+0
|\ \ \ \
| * | | | gralloc: delete unused mutex declarationRom Lemarchand2013-11-261-4/+0
|/ / / / | | | | | | | | | | | | Change-Id: Ibc7e70887b61f7dd885c86d412387636d3a6a867
* | | | Merge commit 'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0' into HEADThe Android Open Source Project2013-11-2248-182/+5273
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am b0c30322: hardware: look in /vendor for default.soColin Cross2013-10-011-0/+4
| |\ \ | | |/ | | | | | | | | | * commit 'b0c303229fcbc89a0afa8f170de64f2a7fee9d6c': hardware: look in /vendor for default.so
| | * hardware: look in /vendor for default.soColin Cross2013-09-301-0/+4
| | | | | | | | | | | | | | | | | | | | | Some vendors have their own HAL modules, which may need their default implementation stored in /vendor. Change-Id: I5337a61875023404a85029bbc59b984056b3e441
| * | am 89cfe208: Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up ↵Eino-Ville Talvala2013-09-251-8/+32
| |\ \ | | |/ | | | | | | | | | | | | | | | INACTIVE" into klp-dev * commit '89cfe20899d41e1c96efc20e3f203d3f1dba71cd': Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE
| | * Merge "Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVE" into ↵Eino-Ville Talvala2013-09-251-8/+32
| | |\ | | | | | | | | | | | | klp-dev
| | | * Camera3: Add PASSIVE_UNFOCUSED AF state and clean up INACTIVEEino-Ville Talvala2013-09-201-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to support the real case of continuous focus giving up on a scene for a while (say, a blank wall), during which we shouldn't claim the lens is in motion. Also add new states for INACTIVE to clarify it as the starting state after mode transitions or enabling AF/AE/AWB. Bug: 10860639 Bug: 10446772 Change-Id: Ie4c1ac73e5a9eb6d1894d83dbded49a2767a8ffd
| * | | am 3bf3b45f: Camera2 Test: skip some tests for limited hardware levelZhijun He2013-09-242-1/+37
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '3bf3b45f2d5eb43b74e1a46ff03ed3e2142b1b38': Camera2 Test: skip some tests for limited hardware level
| | * | Camera2 Test: skip some tests for limited hardware levelZhijun He2013-09-232-1/+37
| | |/ | | | | | | | | | | | | Bug: 10388724 Change-Id: Ifd13f72f1b7ff78cf50dc1c238f17c4b4e90d9b0
| * | am 60cbb526: Camera2 Test: Fix module and burst test issuesZhijun He2013-09-192-17/+35
| |\ \ | | |/ | | | | | | | | | * commit '60cbb52613d212236de49b4f22fe059585f8c1b2': Camera2 Test: Fix module and burst test issues
| | * Camera2 Test: Fix module and burst test issuesZhijun He2013-09-192-17/+35
| | | | | | | | | | | | | | | Bug: 10388724 Change-Id: Idc404cf8a7a96c00941aa8f1880734a236cb3737
| * | am b3ac07c0: Camera2 Tests: fix some sanity checksZhijun He2013-09-172-10/+6
| |\ \ | | |/ | | | | | | | | | * commit 'b3ac07c0028b0afe8f9b009e37af90ec9a697b44': Camera2 Tests: fix some sanity checks
| | * Camera2 Tests: fix some sanity checksZhijun He2013-09-172-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | Remove the requirement of HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED and make and fix some minor issues. Bug: 10388724 Change-Id: I18f0ea60f87902d6c2bbaca53957a91953866c40
| * | am cd996be7: Merge "Initial interface for MemoryTrackerHAL" into klp-devRom Lemarchand2013-09-131-0/+160
| |\ \ | | |/ | | | | | | | | | * commit 'cd996be7791b3f78e925532d5820da06d58cf635': Initial interface for MemoryTrackerHAL
generated by cgit v1.1 at 2025-01-25 17:01:01 +0000