summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Only log non-null invalid pointersHEADreplicant-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-0001staging/cm-14.0stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-14.0cm-13.0Scott Warner2016-01-071-1/+5
| | | | | | | This prevents the endless logspam of 0x0 pointers during animations such as an indeterminate progress dialog Change-Id: I986176800b2173a61e76a21af2caa47a728ba543
* Merge tag 'android-m-preview-2'Scott Warner2016-01-0529-30/+38
|\ | | | | | | | | | | Android m preview 2 Change-Id: Ib852580dce3fd4af91cf402be6fdc83b5f8d8f85
| * Merge "Lose HAVE_ANDROID_OS from hardware/samsung_slsi/exynos5."Elliott Hughes2015-08-121-1/+1
| |\
| | * Lose HAVE_ANDROID_OS from hardware/samsung_slsi/exynos5.Elliott Hughes2015-08-121-1/+1
| |/ | | | | | | Change-Id: I638a8fdc13603448b96cc66e8cc517302ce04936
| * Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-04-031-1/+0
| |\
| | * Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: Ie591e149b4252284c1344261fdabe785250ee16e
| * | am 1458007d: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-261-8/+8
| |\ \ | | | | | | | | | | | | | | | | * commit '1458007d0f8623d649e40c671ad0ec51f4913c79': Separate keymaster0 and keymaster1 HALs.
| | * \ Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-261-8/+8
| | |\ \
| | | * | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-261-8/+8
| | |/ / | | | | | | | | | | | | | | | | Change-Id: Ida47d6fae1ed7e85e7c223900f6b7a2e655fee47 (cherry picked from commit f02e17e73036be67a9c8d6ecc7b82cbc5684131d)
| * | | am 4baab539: exynos: vdec: report width/height as stride/slice-height for ↵Lajos Molnar2015-02-061-0/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUFFER_COPY * commit '4baab539d5854f3270e6eb5a3d12e5be0fd8bdef': exynos: vdec: report width/height as stride/slice-height for BUFFER_COPY
| | * | | exynos: vdec: report width/height as stride/slice-height for BUFFER_COPYLajos Molnar2015-02-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for bytebuffer mode, as decoder actually uses width and height as stride and slice height for the output buffer. Changing only at getParam as the internal value may be used elsewhere. Bug: 19179288 Change-Id: I2a85f02bf626971ae3fa31bafe5af9ac761d3ca8
| * | | | am 1112f2fc: Merge "exynos: vdec: support disabling metadata and native ↵Lajos Molnar2015-02-041-0/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer modes" into lmp-mr1-dev * commit '1112f2fc374699af6ea7c40dc5e57f0bfd77c338': exynos: vdec: support disabling metadata and native buffer modes
| * | | | am 3ece9dfd: Revert "exynos: gralloc: implement gralloc_lock_ycbcr"Lajos Molnar2015-02-042-107/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ece9dfda9477300b641c44cff2e79115987a0b5': Revert "exynos: gralloc: implement gralloc_lock_ycbcr"
| * \ \ \ \ am 6c0730fc: Merge "Fix "error: \'memset\' was not declared in this scope"."Elliott Hughes2015-01-311-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '6c0730fc1030bb41f8857ba5ff768dedb961dce0': Fix "error: 'memset' was not declared in this scope".
| | * | | | Merge "Fix "error: 'memset' was not declared in this scope"."Elliott Hughes2015-01-311-0/+1
| | |\ \ \ \
| | | * | | | Fix "error: 'memset' was not declared in this scope".Elliott Hughes2015-01-301-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I3c08c481e9a315fd374b68142ddedeb2db613c6e
| * | | | | am c65ad165: Merge "Fix "error: \'strerror\' was not declared in this scope"."Elliott Hughes2015-01-311-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c65ad165e47ae46e53fed07b576ff5efbf47b1c8': Fix "error: 'strerror' was not declared in this scope".
| | * | | | Merge "Fix "error: 'strerror' was not declared in this scope"."Elliott Hughes2015-01-311-0/+1
| | |\ \ \ \
| | | * | | | Fix "error: 'strerror' was not declared in this scope".Elliott Hughes2015-01-301-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: If8e3b1d1198df2e725ba08fdecda6bb996e23656
| * | | | | am 7f50a9df: Merge "Fix "error: use of undeclared identifier \'strerror\'"."Elliott Hughes2015-01-311-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f50a9df54ef63467fee5ad08111cfe11f03c3b6': Fix "error: use of undeclared identifier 'strerror'".
| | * | | | Merge "Fix "error: use of undeclared identifier 'strerror'"."Elliott Hughes2015-01-311-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix "error: use of undeclared identifier 'strerror'".Elliott Hughes2015-01-301-0/+1
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I96065fe96e98073360340f042dc1736ce508e02b
| * | | | am 25ffbfe5: exynos: gralloc: implement gralloc_lock_ycbcrLajos Molnar2015-01-292-5/+107
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '25ffbfe5e8b51f392fafc1bffb16b6633a8ba3df': exynos: gralloc: implement gralloc_lock_ycbcr
| * \ \ \ \ am f2eb9594: manta: libcamera2: fix copy-and-paste regressionMark Salyzyn2015-01-161-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2eb959463914d0928d20fda3fb860365e57ea9f': manta: libcamera2: fix copy-and-paste regression
| * \ \ \ \ \ am 29a60df6: exynos_omx: check pointer before use to workaround potential crash.Ronghua Wu2015-01-071-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '29a60df69e0caa0800bc7cf848b00b719019bb6c': exynos_omx: check pointer before use to workaround potential crash.
| * \ \ \ \ \ \ am 66efbe79: Merge "Suppress or fix clang errors before the fix from upstream."Chih-Hung Hsieh2015-01-0613-2/+29
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '66efbe79457a52ffcef470089a35ac39514759f5': Suppress or fix clang errors before the fix from upstream.
| | * | | | | | Merge "Suppress or fix clang errors before the fix from upstream."Chih-Hung Hsieh2015-01-0613-2/+29
| | |\ \ \ \ \ \
| | | * | | | | | Suppress or fix clang errors before the fix from upstream.Chih-Hung Hsieh2015-01-0613-2/+29
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make Exynos_UpdateFrameSize global to link with other modules. * Suppress warnings about int conversion, pointer conversion, implicit function declaration, sign/unsign comparison, and c++11-narrowing. Change-Id: I462902cbc0d1c3442d59a6741c66d8a870a99e8c
| * | | | | | | am 35575718: Merge "Fix "hardware/samsung_slsi/exynos5/libcsc/csc.c:341:67: ↵Elliott Hughes2014-12-301-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error: \'errno\' undeclared"." * commit '35575718dd13c61263b5b1d090cc747b16e160d9': Fix "hardware/samsung_slsi/exynos5/libcsc/csc.c:341:67: error: 'errno' undeclared".
| | * | | | | | Merge "Fix "hardware/samsung_slsi/exynos5/libcsc/csc.c:341:67: error: ↵Elliott Hughes2014-12-291-0/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'errno' undeclared"."
| | | * | | | | | Fix "hardware/samsung_slsi/exynos5/libcsc/csc.c:341:67: error: 'errno' ↵Elliott Hughes2014-12-291-0/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | undeclared". Change-Id: Ic5982302a0dd0a88bac7aaf30128a84b2c1cd95c
| * | | | | | | am 6e324cc3: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-1617-17/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6e324cc3a987b3aee665a5ec32993018d84479d4': Cleanup Obsolete LOCAL_PRELINK_MODULE.
| | * | | | | | Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-1617-17/+0
| | |\ \ \ \ \ \
| | | * | | | | | Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-1617-17/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18675947 Change-Id: Id460accbd37f1cbdf84c94510064ac4ac261f77e
| * | | | | | | am 31346bb9: Merge "Fix a build break due to a change in libui"Dan Stoza2014-12-091-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31346bb9622e96aa6b93838b2f8b144360503098': Fix a build break due to a change in libui
| | * | | | | | Merge "Fix a build break due to a change in libui"Dan Stoza2014-12-081-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix a build break due to a change in libuiDan Stoza2014-12-081-1/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Rect constructor became ambiguous because of the addition of a new overload. This resolves the ambiguity to fix the build, but the dependency on libui should be removed altogether. Bug: 18668702 Change-Id: I923fcf793790776cd067933292ec8c8050f27d1c
| * | | | | | | am d6d94475: manta: libcamera2: if captured shot drained, record current ↵Mark Salyzyn2014-12-021-12/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shot data * commit 'd6d94475d878944562d0f1e16a5b6508fce87e3e': manta: libcamera2: if captured shot drained, record current shot data
| * \ \ \ \ \ \ \ am 2be288ff: Merge "Fix build after C++11 migration."Dan Albert2014-11-252-7/+7
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '2be288ff70a54d330c12496958a42b6d9e52b51e': Fix build after C++11 migration.
| | * | | | | | | Merge "Fix build after C++11 migration."Dan Albert2014-11-252-7/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix build after C++11 migration.Dan Albert2014-11-252-7/+7
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More UD literal issues. `using namespace std` should be illegal. Change-Id: If408f360e28acf9159705b9b724c7c083391ff71
| * | | | | | | | am 492a2506: manta: libcamera2: drain requests on empty request queueMark Salyzyn2014-11-202-7/+16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '492a2506b49ab9dfd574ab354ef6edcfd7ba6a68': manta: libcamera2: drain requests on empty request queue
| * \ \ \ \ \ \ \ \ am cc270654: Merge "Stop using stlport."Dan Albert2014-11-172-4/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc2706542fc0fb3b54c40e173e9d08d042571660': Stop using stlport.
| | * | | | | | | | Merge "Stop using stlport."Dan Albert2014-11-172-4/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Stop using stlport.Dan Albert2014-11-172-4/+0
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: Ib432eb3d54ccc04bcd21562c87384bd8ea292828
| * | | | | | | | | am d1fb36a4: libgscaler: fix a mutex leakChien-Yu Chen2014-11-122-2/+18
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1fb36a4395f15f2be77f0af3844169c7a95ebb5': libgscaler: fix a mutex leak
| * \ \ \ \ \ \ \ \ \ am 5eb3e42a: am 88c954f6: remove misleading error messages: free only ↵SeungBeom Kim2014-10-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocated ion buffers on exit * commit '5eb3e42ab19502d21b7235fe2693ac8ed1e8c35c':
| | * | | | | | | | | am 88c954f6: remove misleading error messages: free only allocated ion ↵SeungBeom Kim2014-10-141-3/+6
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers on exit * commit '88c954f60ea8c74f305942bc55c32bc30f6aa9ef': remove misleading error messages: free only allocated ion buffers on exit
| * | | | | | | | | | | am 0d6f9179: am d4ec0f61: exynos_omx: multi_thread: Fix bug for video encode ↵SeungBeom Kim2014-10-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests. * commit '0d6f917983c2c5ea96245935d022287b11273a77':
| | * | | | | | | | | | am d4ec0f61: exynos_omx: multi_thread: Fix bug for video encode tests.SeungBeom Kim2014-10-142-3/+21
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd4ec0f61b9819c82c57daa98b891a3132ffa03b5': exynos_omx: multi_thread: Fix bug for video encode tests.