summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | 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 "camera3: Remove old vendor tag ops dependencies."Ruben Brunk2014-03-131-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | camera3: Remove old vendor tag ops dependencies.Ruben Brunk2014-03-101-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I7acdf76d4c0674bdb1cc939592d4620687c785c3
* | | | | | | | | | | | | | | | | | Merge "Add HWC 1.4 with support for sideband video layers"Jesse Hall2014-03-112-8/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add HWC 1.4 with support for sideband video layersJesse Hall2014-03-112-8/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie40668a8667e26f1d570a2f756f1178d0dcbbf5c
* | | | | | | | | | | | | | | | | | | am cf39fcfc: am 98add895: Add \'get_logical_address\' in HDMI-CEC HAL interfaceJinsuk Kim2014-03-111-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf39fcfc4b4ce944b840a7cc1df2244709b96093': Add 'get_logical_address' in HDMI-CEC HAL interface
| * | | | | | | | | | | | | | | | | | am 98add895: Add \'get_logical_address\' in HDMI-CEC HAL interfaceJinsuk Kim2014-03-111-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '98add8956b1a346425df40d2f70a9ca33500f01c': Add 'get_logical_address' in HDMI-CEC HAL interface
| | * | | | | | | | | | | | | | | | | Add 'get_logical_address' in HDMI-CEC HAL interfaceJinsuk Kim2014-03-111-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new function allows the HDMI-CEC service to get the logical address updated by HAL implementation. Change-Id: I1a4c5f7b7773279091d5bd7c6971a8c9090a81ca
* | | | | | | | | | | | | | | | | | | am 18fd3c6e: am 355e5d68: Merge "[HDMI-CEC] Modify the signature of ↵Jinsuk Kim2014-03-111-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | register_event_callback" into klp-modular-dev * commit '18fd3c6e9db8f10c15e54b345ec8031c3d259b16': [HDMI-CEC] Modify the signature of register_event_callback
| * | | | | | | | | | | | | | | | | | am 355e5d68: Merge "[HDMI-CEC] Modify the signature of ↵Jinsuk Kim2014-03-111-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | register_event_callback" into klp-modular-dev * commit '355e5d68021b272f692e5aa26f21fb4da57b3b93': [HDMI-CEC] Modify the signature of register_event_callback
| | * | | | | | | | | | | | | | | | | Merge "[HDMI-CEC] Modify the signature of register_event_callback" into ↵Jinsuk Kim2014-03-111-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev
| | | * | | | | | | | | | | | | | | | | [HDMI-CEC] Modify the signature of register_event_callbackJinsuk Kim2014-03-081-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional parameter helps the caller avoid managing a static instance variable. The parameter is used to pass the caller object itself. Change-Id: I06cbcc7736031678f4638a0b5082d7b6a7ea51b6
* | | | | | | | | | | | | | | | | | | | am b0a325a7: am 5d082f18: Merge "Fix PAN control callback definition to ↵Matthew Xie2014-03-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | / / / / / / / / / / / / / | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match what bluedroid is doing." * commit 'b0a325a77c126f0ad94ea7ac92eebc23e3956fdf': Fix PAN control callback definition to match what bluedroid is doing.
| * | | | | | | | | | | | | | | | | | am 5d082f18: Merge "Fix PAN control callback definition to match what ↵Matthew Xie2014-03-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bluedroid is doing." * commit '5d082f1826cd5b72cd2a0eb0116c8a613d7555dd': Fix PAN control callback definition to match what bluedroid is doing.
| | * | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | am 2aeee06b: (-s ours) am fc9be0a2: am 56910cf5: (-s ours) Merge "DO NOT ↵Wei Wang2014-03-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / / / | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-dev * commit '2aeee06bb407b61c5e3da0da761454b404e35d3d': DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
| * | | | | | | | | | | | | | | | | am fc9be0a2: am 56910cf5: (-s ours) Merge "DO NOT MERGE BLE peripheral mode ↵Wei Wang2014-03-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (1/4): change HAL to support service data and service uuids." into klp-dev * commit 'fc9be0a2438fca7bd7e961a86fd8d17f14b52623': DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
| | * | | | | | | | | | | | | | | | am 56910cf5: (-s ours) Merge "DO NOT MERGE BLE peripheral mode (1/4): change ↵Wei Wang2014-03-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAL to support service data and service uuids." into klp-dev * commit '56910cf52332219c6a23bc12596b261c127d93bf': DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
| | | * | | | | | | | | | | | | | | Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service ↵Wei Wang2014-03-081-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data and service uuids." into klp-dev
| | | | * | | | | | | | | | | | | | DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data ↵Wei Wang2014-03-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and service uuids. Cherry picking ble advertising changes from master to KLP MR2. b/13137996 Change-Id: I19a3755a4ed16e1ae03368cecee97773c05c1770
* | | | | | | | | | | | | | | | | | am a043baa9: am 57ac9a9e: Merge "Add handshake_callback to bt_hh" into ↵Mike J. Chen2014-03-071-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'a043baa9c8ad46abb8708136d653d2a5f8d96359': Add handshake_callback to bt_hh
| * | | | | | | | | | | | | | | | | am 57ac9a9e: Merge "Add handshake_callback to bt_hh" into klp-modular-devMike J. Chen2014-03-071-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57ac9a9e96fb50dba33b05e9ffac1c9f5a1ada8f': Add handshake_callback to bt_hh
| | * | | | | | | | | | | | | | | | Merge "Add handshake_callback to bt_hh" into klp-modular-devMike J. Chen2014-03-071-2/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Add handshake_callback to bt_hhMike J. Chen2014-02-251-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I505b1e56ee10c955eedff2e4d142cb7caa6b9fb2 Signed-off-by: Mike J. Chen <mjchen@google.com>
* | | | | | | | | | | | | | | | | | | NBAIO::Format_from_SR_C requires audio_format_t parameterGlenn Kasten2014-03-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8bdfbd227dbfd4a46eb7ffc82ec7064582a626d0
* | | | | | | | | | | | | | | | | | | am 9c19b548: am ee4e28c9: am 1482406b: usbaudio: fix for out->dev->lock ↵Amit Shekhar2014-03-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remains locked in error case * commit '9c19b5480f7921e62d2a102abafe0c159b7679b8': usbaudio: fix for out->dev->lock remains locked in error case
| * | | | | | | | | | | | | | | | | | am ee4e28c9: am 1482406b: usbaudio: fix for out->dev->lock remains locked in ↵Amit Shekhar2014-03-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error case * commit 'ee4e28c9ebc7f26a1a25d1042d5a941139055447': usbaudio: fix for out->dev->lock remains locked in error case
| | * | | | | | | | | | | | | | | | | am 1482406b: usbaudio: fix for out->dev->lock remains locked in error caseAmit Shekhar2014-03-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | / / / / / / / / / / / | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | * commit '1482406b70a254fc85d153a7066d7f90d724d195': usbaudio: fix for out->dev->lock remains locked in error case
| | | * | | | | | | | | | | | | | | usbaudio: fix for out->dev->lock remains locked in error caseAmit Shekhar2014-03-061-1/+1
| | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out->dev->lock remains locked in error case in out_write() Added pthread_mutex_unlock() in the error case Bug: 12824374 Change-Id: Id467e3122008eb8128b42dfc0e9103600c1eef2d Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | | | | | | | | | | | | | am 8a90666c: am 282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"Jesse Hall2014-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a90666cccac19314216ab1ff8b99ecb854ccf04': gralloc: dont hardcode 32bpp as RGBX
| * | | | | | | | | | | | | | | | am 282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"Jesse Hall2014-03-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '282ab1b6b1a92b8cb2650c111bfab02916f8715d': gralloc: dont hardcode 32bpp as RGBX
| | * | | | | | | | | | | | | | | 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>
* | | | | | | | | | | | | | | am b3d1dda5: am b342abb6: Merge "gralloc: make private_handle_t layout ↵Greg Hackmann2014-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistent on 32/64-bit" * commit 'b3d1dda5130ae1ae4eab6cb4fe56f5793bc66042': gralloc: make private_handle_t layout consistent on 32/64-bit
| * | | | | | | | | | | | | | am b342abb6: Merge "gralloc: make private_handle_t layout consistent on ↵Greg Hackmann2014-03-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32/64-bit" * commit 'b342abb6902a698963bb9d2108000da895845985': gralloc: make private_handle_t layout consistent on 32/64-bit
| | * | | | | | | | | | | | | 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>
* | | | | | | | | | | | | | Rename setStreamOutput to invalidateStreamGlenn Kasten2014-02-281-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And simplify by removing the unused I/O handle parameter 'output'. Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e
* | | | | | | | | | | | | | am abd0a90b: am b96f1083: Merge "Move libhardware of <asm/page.h>."Elliott Hughes2014-02-251-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | / / / / / / | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | * commit 'abd0a90bc02b2f574ea62a457d3302b1ce7cf7c8': Move libhardware of <asm/page.h>.
| * | | | | | | | | | | | am b96f1083: Merge "Move libhardware of <asm/page.h>."Elliott Hughes2014-02-251-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b96f1083b8d10f3e33b64f0da943dedfdb25b557': Move libhardware of <asm/page.h>.
| | * | | | | | | | | | | 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
* | | | | | | | | | | | am 055c209a: am 5f9a7907: Merge "Header file for HDMI-CEC HAL interface ↵Jinsuk Kim2014-02-211-0/+282
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | definition" into klp-modular-dev * commit '055c209a15788ead2043e9fe162169df460d3a53': Header file for HDMI-CEC HAL interface definition
| * | | | | | | | | | | am 5f9a7907: Merge "Header file for HDMI-CEC HAL interface definition" into ↵Jinsuk Kim2014-02-211-0/+282
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit '5f9a7907844ba5319957dd9913ef951d78709afb': Header file for HDMI-CEC HAL interface definition
| | * | | | | | | | | | Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-devJinsuk Kim2014-02-211-0/+282
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Header file for HDMI-CEC HAL interface definitionJinsuk Kim2014-02-201-0/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added here is the header file that defines HDMI-CEC HAL interface. Its main purpose is to support major CEC features such as 'one touch play', 'standby' for playback device. But basic skeleton for supporting other kinds of devices(like TV) is also in place. Change-Id: Iccbbec398bc675d69cb78ad6848ec57ac727cb8d
* | | | | | | | | | | | am 6c8ad5aa: am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit ↵Colin Cross2014-02-161-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HAL libraries" * commit '6c8ad5aa80a12c5a76cf22d5b87097ee5d950c62': Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
| * | | | | | | | | | | am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"Colin Cross2014-02-161-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26': Use /(vendor|system)/lib64/hw for 64-bit HAL libraries