summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | am 1def25a2: Merge commit \'7ac60686\' into manualmergeAdam Lesinski2015-05-281-2/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1def25a210ca502a97020efb732775d5c2df2d9a': Prevent integer overflow when allocating native_handle_t
| | | * | | | | | | | | | | | | | | | | Merge commit '7ac60686' into manualmergeAdam Lesinski2015-05-271-2/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I671a57d906ca6826722fb892627d235b14b822eb
| | | | * | | | | | | | | | | | | | | | am 058ad0b6: am e8582d65: am 9bd7afc0: Prevent integer overflow when ↵Adam Lesinski2015-05-271-5/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocating native_handle_t * commit '058ad0b6612457c54c7ad6e3b5d5a618d94ae966': Prevent integer overflow when allocating native_handle_t
| | | | | * | | | | | | | | | | | | | | am e8582d65: am 9bd7afc0: Prevent integer overflow when allocating ↵Adam Lesinski2015-05-271-5/+13
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native_handle_t * commit 'e8582d65ea03a91b5cdc2c374ec9a420f809138f': Prevent integer overflow when allocating native_handle_t
| | | | | | * | | | | | | | | | | | | | am 9bd7afc0: Prevent integer overflow when allocating native_handle_tAdam Lesinski2015-05-271-5/+13
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|/ / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9bd7afc0a1de9589c13355178b6edc709bd0bddf': Prevent integer overflow when allocating native_handle_t
| | | | | | | * | | | | | | | | | | | | Prevent integer overflow when allocating native_handle_tAdam Lesinski2015-05-271-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User specified values of numInts and numFds can overflow and cause malloc to allocate less than we expect, causing heap corruption in subsequent operations on the allocation. Bug: 19334482 Change-Id: I43c75f536ea4c08f14ca12ca6288660fd2d1ec55
* | | | | | | | | | | | | | | | | | | | Don't use TEMP_FAILURE_RETRY on close in system/core.Elliott Hughes2015-05-275-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/20501816 Change-Id: I1839b48ee4f891b8431ecb809e37a4566a5b3e50 (cherry picked from commit 47b0134ec2b5e8c8b5b5671cd4a3e41261275532)
* | | | | | | | | | | | | | | | | | | | Merge "[gatekeeperd] return brute-force throttling information" into mnc-devAndres Morales2015-05-279-43/+465
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | [gatekeeperd] return brute-force throttling informationAndres Morales2015-05-279-43/+465
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21118563 Change-Id: I13c6a44f61668be8b4c1fde8c84dcfebab84517c
* | | | | | | | | | | | | | | | | | | | Merge "Graphics depth formats: Add confidence values" into mnc-devEino-Ville Talvala2015-05-271-13/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Graphics depth formats: Add confidence valuesEino-Ville Talvala2015-05-261-13/+29
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supplement the dense and sparse depth image formats with confidence values. For {HAL_PIXEL_FORMAT_Y_16, HAL_DATASPACE_DEPTH}, use the 3 MSBs for confidence. For {HAL_PIXEL_FORMAT_BLOB, HAL_DATASPACE_DEPTH}, add a 4th float value for confidence. Bug: 20123879 Change-Id: Idc27081efec682a712ce77ccfec59328f298b944
* | | | | | | | | | | | | | | | | | | | Merge "Adding a build id check to blob cache." into mnc-devMichael Lentine2015-05-273-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Adding a build id check to blob cache.Michael Lentine2015-05-183-7/+23
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a build id field to the header structure in blob cache. Add build id support with reading and writing the cache. When the cache gets written it writes the build id at the end of the header. When read it checks to see if there is a match between the current version and the version in the cache. If not, it invalidates the cache which would typically only occur during an ota update. Also remove blob cache from the host build. bug: 18262905 Change-Id: I753b1de1986703a4c1c8691b9d2bb533b2546143
* | | | | | | | | | | | | | | | | | | Merge "Don't use TEMP_FAILURE_RETRY on close()" into mnc-devNick Kralevich2015-05-231-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Don't use TEMP_FAILURE_RETRY on close()Nick Kralevich2015-05-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://lkml.org/lkml/2005/9/10/129 for details. (cherry-picked from commit 95db36e1287988a7184cdcd87699ad07e068a639) Bug: 20501816 Change-Id: I38bf5052f44034c6f866d10d7d07187f0053a7a1
* | | | | | | | | | | | | | | | | | | init: wait_for_file use smaller time resolutionThierry Strudel2015-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As 1s timeout can be requested, using second resolution time to check for timeout prevent from being accurate on the actual time we wait. Use available gettime_ns instead. Bug: 21374269 Change-Id: I8be1b69e02beacc7196427f97855e036addf54d1 Signed-off-by: Thierry Strudel <tstrudel@google.com>
* | | | | | | | | | | | | | | | | | | Remove unused includeJim Miller2015-05-211-1/+0
| |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 21370426 Change-Id: I693dc6d741d4ede0a0e44d6b75ade7459ef9a3ed
* | | | | | | | | | | | | | | | | | Merge "Move from native FingerprintService implementation to fingerprintd" ↵Jim Miller2015-05-218-0/+804
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | | | | | | | Move from native FingerprintService implementation to fingerprintdJim Miller2015-05-208-0/+804
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new service, fingerprintd, that manages fingerprint hardware from a separate process. It provides a binder interface that FingerprintManager uses to talk to the fingerprint HAL. Change-Id: I64b92589f4d75743ebe96894f07bec515945c61e
* | | | | | | | | | | | | | | | | logd: worst-UID only to preserve a dayMark Salyzyn2015-05-202-1/+26
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 833a9b1e38ce65f2cdf3ebd095aaa99a92eb9467) Do not invoke worst-UID pruning in the face of other UIDs logs that are more than a day old, switch to pruning oldest only. Change-Id: Icf988b8d5458400a660d0f8e9d2df3f9d9a4c2d9
* | | | | | | | | | | | | | | | klog: don't unconditionally call mknod()Nick Kralevich2015-05-191-0/+5
| |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If /dev/kmsg already exists, it's unnecessary for klog_init() to create it's own copy. This avoids needing to grant the mknod permission to everyone who uses kmsg. Typically the only time /dev/kmsg doesn't exist is before ueventd starts. (cherrypicked from commit 4d32a486fe62ef2c1440167604654a2f4e023fbd) Bug: 21242418 Change-Id: I0c88d80feca6899fcdbc8c9f2f99448ee0a3422d
* | | | | | | | | | | | | | | Merge "Prevent integer overflow when allocating native_handle_t" into mnc-devAdam Lesinski2015-05-191-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Prevent integer overflow when allocating native_handle_tAdam Lesinski2015-05-151-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User specified values of numInts and numFds can overflow and cause malloc to allocate less than we expect, causing heap corruption in subsequent operations on the allocation. Bug: 19334482 Change-Id: I43c75f536ea4c08f14ca12ca6288660fd2d1ec55
* | | | | | | | | | | | | | | | Merge "Add TEMP_FAILURE_RETRY to libsuspend." into mnc-devJeff Brown2015-05-183-19/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add TEMP_FAILURE_RETRY to libsuspend.Jeff Brown2015-05-183-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In testing, I observed one instance of a call failing due to a signal sent to the process. This could happen at various times so it's better to be safe than sorry. Bug: 20534809 Change-Id: I42242087300d8b840a50aec34aa6b2e1507cab50
* | | | | | | | | | | | | | | | Revert "Switch to toybox ls."Elliott Hughes2015-05-152-0/+589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9c94aa9982c562585c08c5f95569695ccc64f846. Change-Id: Ie2479ee4a0614e285ce8d57c727200a0381904e2 (cherry picked from commit 88f0f4b2b48ab5c685e91e1f23913cad97015bac)
* | | | | | | | | | | | | | | | Switch to toybox ls.Elliott Hughes2015-05-152-589/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/21171466 Change-Id: I3fa09db7ca43d337cbda60f10269e7607544982b (cherry picked from commit 9c94aa9982c562585c08c5f95569695ccc64f846)
* | | | | | | | | | | | | | | | Switch UniquePtr to std::unique_ptr.Christopher Ferris2015-05-152-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21209050 Change-Id: I91d4c44de479b37f2729382fcdf103b8c69aa668 (cherry picked from commit 6e96403b8fd25a98f2cfc9680de45f39ff4ec491)
* | | | | | | | | | | | | | | | Enable clang compilation.Chih-Hung Hsieh2015-05-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous clang/llvm bug was fixed. BUG: 18790528 Change-Id: Ib12696030d34ebc3c3ef1bca3cad0139d631417e (cherry picked from commit 1cd02d344331735fbaf76e68d0e66c62151ac836)
* | | | | | | | | | | | | | | | Fix ' escaping in adb.Elliott Hughes2015-05-153-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can't just use \' inside a single-quoted string. Bug: http://b/20323053 Bug: http://b/3090932 Change-Id: I73754b097671d02dc11c35052f0534b6dd789e4f (cherry picked from commit 84b0bf22644b35d6b3d3f7dc96311a484c3519b3)
* | | | | | | | | | | | | | | | Reduce the coldboot timeout to 1s.Elliott Hughes2015-05-151-1/+4
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5s was already a ridiculously long time to delay booting, and some OEMs are trying to make it even more insane: https://www.codeaurora.org/cgit/quic/la/platform/system/core/commit/?h=lp&id=fd23edd48272976d2fb333f377242173f92aa343 Let's at least ensure that Nexus and Android One devices don't take forever to boot... Bug: http://b/19899875 Change-Id: I9680c166a759360f34118e51cd0645e12b6bd5c8 (cherry picked from commit c7331d02d1c6b1e51b3a1210506f38fd61819495)
* | | | | | | | | | | | | | | Prevent crashes if a map cannot be created.Christopher Ferris2015-05-155-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under some conditions, /proc/<pid>/maps might return nothing. If we try and unwind in this case, we'll crash. Check this case and fail the unwind. Add checks that no other functions try and use map_ without checking for nullptr. Add logging when an unwind fails so it's clear what happened. Bug: 21162746 Change-Id: I56ce51dda0cfc9db20475a441f118108196aa07c (cherry picked from commit 30c942cf1024bf791c28ab9b67a1f752de72248c)
* | | | | | | | | | | | | | | Merge "Move SoftGateKeeper into gatekeeperd" into mnc-devAndres Morales2015-05-144-15/+216
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move SoftGateKeeper into gatekeeperdAndres Morales2015-05-144-15/+216
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows for easy determination of whether there's a hardware module in place. Permits tighter coupling of software implementation with upper-level stack. Bug:21090356 Change-Id: I275b57cd976c233c43c476c5869c5a4b29fbc175
* | | | | | | | | | | | | | Add tests for elf unwinding in memory.Christopher Ferris2015-05-132-4/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19517541 (cherry picked from commit 67aba6881d8857d3017e11695207eb2ade45a274) Change-Id: I914636ccd814e041475b6b2d81119cac1745a9ff
* | | | | | | | | | | | | | Remove libbacktrace definition of gettid.Dan Albert2015-05-136-31/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also simplifies the Darwin implementation of gettid, because apparently libbacktrace had a better way of doing it. Bug: 19517541 (cherry picked from commit 23f750b068ddf5b20fb5d153a798b22562368992) Change-Id: I2f888e8ed7a2f5719973786cbcbb399a81867ee9
* | | | | | | | | | | | | | Fix gettid() on Windows.Dan Albert2015-05-132-28/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accidentally had this all hidden by an #ifndef _WIN32 when I wrote it. Bug: 19517541 (cherry picked from commit b3a36ca5ee79411c18984b85b224d9285b4468af) Change-Id: Ifbd5d19e506e7313700e2e29a2dae5736e049844
* | | | | | | | | | | | | | am 2557cd21: am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to ↵Iliyan Malchev2015-05-131-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be specified as percentage of total memory" into lmp-mr1-dev * commit '2557cd21f0af31d6dafee24d649f83314d2896d4': fs_mgr: allow for zramsize to be specified as percentage of total memory
| * | | | | | | | | | | | | am 8b448629: am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified ↵Iliyan Malchev2015-05-121-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as percentage of total memory" into lmp-mr1-dev * commit '8b4486294053ea96ac50d8c07d4fc23729ef7c52': fs_mgr: allow for zramsize to be specified as percentage of total memory
| | * | | | | | | | | | | | am 16092b7a: Merge "fs_mgr: allow for zramsize to be specified as percentage ↵Iliyan Malchev2015-05-121-1/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of total memory" into lmp-mr1-dev * commit '16092b7a48e8426515f67206be2f0aee92fd6006': fs_mgr: allow for zramsize to be specified as percentage of total memory
| | | * | | | | | | | | | | Merge "fs_mgr: allow for zramsize to be specified as percentage of total ↵Iliyan Malchev2015-05-121-1/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memory" into lmp-mr1-dev
| | | | * | | | | | | | | | | fs_mgr: allow for zramsize to be specified as percentage of total memoryIliyan Malchev2015-05-011-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the zramsize entry has a % size at the end, as in the following example: /dev/block/zram0 none swap defaults zramsize=25% then we will set the value as that percentage of total RAM, as read by scanning /proc/meminfo. b/20760266 Seed common build allocated too much for zRAM-backed swap Change-Id: I17c91d311ba99ae7adae112bfe1b38542ea69b80 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | | | | | | | | | | | liblog: gtest open("/dev/pmsg0", "a")Mark Salyzyn2015-05-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit df0257d344b6d85bbbdae248748040e15aac35b8) Change-Id: I918025a8ac28204076ce4831ce277b04091619f6
* | | | | | | | | | | | | | | logd: Add TID statisticsMark Salyzyn2015-05-134-3/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 17ed6797df722464eb5cc6dfc3e1e32aec284b70) Bug: 19608965 Change-Id: Ifbf0b00c48ef12b5970b9f9f217bd1dd8f587f2c
* | | | | | | | | | | | | | | logd: CleanupMark Salyzyn2015-05-1312-119/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 7718778793b106498b931dd708a466cf3a6f6a0f) - Android Coding Standard for Constructors - Side effects NONE Change-Id: I2cda9dd73f3ac3ab58f394015cb810820093d47b
* | | | | | | | | | | | | | | logcat: liblog: Add "usec" format argumentMark Salyzyn2015-05-133-28/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit e1f2004ecc05ce2d5d4313d16c7791594643f2ef) - Add additional 3 digits of time precision for time output adding in the reporting of usec - Remove trailing space in header file Change-Id: Ifb560850b8e01080e126fbaeab640db71cce3eea
* | | | | | | | | | | | | | | logd: Add klogdMark Salyzyn2015-05-139-24/+587
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit ae4d928d816e30dbe57c2c321b0f0759d0567b3f) - Add a klogd to collect the kernel logs and place them into a new kernel log buffer - Parse priority, tag and message from the kernel log messages. - Turn off pruning for worst UID for the kernel log buffer - Sniff for 'PM: suspend exit', 'PM: suspend enter' and 'Suspended for' messages and correct the internal definition time correction against monotonic dynamically. - Discern if we have monotonic or real time (delineation 1980) in audit messages. - perform appropriate math to correct the timestamp to be real time - filter out any external sources of kernel logging Change-Id: I8d4c7c5ac19f1f3218079ee3a05a50e2ca55f60d
* | | | | | | | | | | | | | | liblog: Add kernel log idMark Salyzyn2015-05-134-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 440e109d642b691eb857d14bcd1af76740e305fa) Change-Id: I53002f05a8bdf8d67e1d761c56c8761d3b534a76
* | | | | | | | | | | | | | | Fix file descriptor leak when opening invalid archives.Narayan Kamath2015-05-133-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add -Wunreachable-code to the set of compiler flags, otherwise noreturn becomes considerably less useful. bug: https://code.google.com/p/android/issues/detail?id=171099 Change-Id: I9a95d45633c731c7046d4e4a39844d9cebfd1718
* | | | | | | | | | | | | | | Merge "rootdir: add permission for /dev/dvb*" into mnc-devTerry Heo2015-05-131-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
generated by cgit v1.1 at 2025-09-15 14:04:11 +0000