summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of e3c22c41 to stage-aosp-masterCalin Juravle2014-10-2811-47/+313
|\ | | | | | | Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d
| * Merge "Handle code_cache dir creation in libnativebridge"Calin Juravle2014-10-2711-46/+312
| |\
| | * Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-2711-46/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - add kPreInitiliazed state to native bridge with check transition: kOpened->kPreInitialized->kInitialized - made sure we free the memory for the code_cache_path - tidy up some error messages - tidy up tests - add a dummy native bridge to test with Bug: 18027433 Bug: 18097480 Change-Id: I39f74c93580f2e224080dd3df2ffaa9cf9f8cd9c
* | | am d88323b2: Merge "Add volatile to avoid clang optimization."Chih-Hung Hsieh2014-10-281-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'd88323b2667c443c2738eb601eb0b9eaad1c3049': Add volatile to avoid clang optimization.
| * | Merge "Add volatile to avoid clang optimization."Chih-Hung Hsieh2014-10-241-1/+1
| |\ \
| | * | Add volatile to avoid clang optimization.Chih-Hung Hsieh2014-10-231-1/+1
| |/ / | | | | | | | | | | | | BUG: 18108178 Change-Id: Ie5b8b1808fcf6d1eacc14a7c6ac0c8d49641fec2
* | | am 5bea7edd: Merge "Fix type cast error, should be char* not void*."Chih-Hung Hsieh2014-10-281-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '5bea7edddd1bca0f94b08f3fb7aefab1c3021e17': Fix type cast error, should be char* not void*.
| * | Merge "Fix type cast error, should be char* not void*."Chih-Hung Hsieh2014-10-231-1/+1
| |\ \
| | * | Fix type cast error, should be char* not void*.Chih-Hung Hsieh2014-10-231-1/+1
| |/ / | | | | | | | | | | | | BUG: 18106835 Change-Id: Ic0051d5035e5684de0091cd3528d65e1b1e57161
* | | Merge commit 'b2042f7263c7bbacc5115de4a42c5a96b64a06f2' into HEADBill Yi2014-10-22103-2544/+6101
|\ \ \
| * \ \ am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PEAdam Lesinski2014-10-201-2/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2': MingW doesn't handle __attribute__((weak)) for Windows PE
| | * | | MingW doesn't handle __attribute__((weak)) for Windows PEAdam Lesinski2014-10-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows PE format doesn't have the same support for weak symbols as ELF does. The symbol android_log_id_to_name was strangely omitted from the resulting Windows executable and the callsite where it was supposed to be called was relaced with a different symbol, which caused a crash in AAPT on Windows. This change works due to a careful set of #ifdefs that ensure only one definition of android_log_id_to_name is defined, but there are other uses of __attribute__((weak)) which should be inspected. Change-Id: I3b58076e31d9b28c5143773a170e9ffda9fa3815
| * | | | am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"JP Abgrall2014-10-201-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e38ab476f808f84f0755ccbceb4cd7d8a1982a3': adb: Add USB vendor ID for TrekStor GmbH
| * \ \ \ \ am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-devXavier Ducrohet2014-10-161-1/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '1c77bf4ce5059f3a770418cfa8afed39ee41ab24': Fix windows specific behavior of FileMap
| | * | | | Merge "Fix windows specific behavior of FileMap" into lmp-devXavier Ducrohet2014-10-161-1/+0
| | |\ \ \ \
| | | * | | | Fix windows specific behavior of FileMapXavier Ducrohet2014-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of the FileMap destructor would close the file, only on Windows, which did not match the behavior on mac/linux. This is because calling munmap does not close the file descriptor. It must be closed separately, before or after munmap. On Windows, the file must also be closed manually, before or after closing the mappingFile. The change basically removes the closing file from the windows-specific part of the destructor, to make behavior more consistent on all platforms where the caller to FileMap is responsible for closing its own file (since FileMap receives an opened file). Change-Id: I5e3cfffbb870d5f3595802ccac57dbc1dbf1ce6e
| * | | | | | am cd1da4e0: Fix toolchain issue for windows build of libziparchive.Xavier Ducrohet2014-10-161-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'cd1da4e04f0eb71a92a586c66acd0e34115608e1': Fix toolchain issue for windows build of libziparchive.
| | * | | | | Fix toolchain issue for windows build of libziparchive.Xavier Ducrohet2014-10-161-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With mingw 4.8, the new default packed behavior is broken and makes zip archive fails due to unexpected misalignment in CentralDirectoryRecord. This patch uses -mno-ms-bitfields to revert to the old packed behavior. Change-Id: Ic977c841e330e19451db1d31ddb22e570a525062
| * | | | | am 2d241ec8: am 3a387176: Merge "Don\'t build init with clang for now"Chih-hung Hsieh2014-10-161-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d241ec8a86c56bbf8522eb007674d7b4e3d164d': Don't build init with clang for now
| * \ \ \ \ \ am 67f46cb0: Fix issue #18000467: processgroup truncates bufferDianne Hackborn2014-10-151-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '67f46cb0e137edbf4a6f7014ca8a3a58484016d1': Fix issue #18000467: processgroup truncates buffer
| | * | | | | Fix issue #18000467: processgroup truncates bufferDianne Hackborn2014-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d98a4da9c47d83d25a11ff0ef94cfcab1feabea
| * | | | | | am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function ↵Chih-Hung Hsieh2014-10-152-39/+68
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bodies." * commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd': Do not inline rarely used trace function bodies.
| * \ \ \ \ \ \ am 4f083c61: am a8aad166: Merge "logd: insert order for first entry"Mark Salyzyn2014-10-151-1/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f083c6156cb59eddcb52094da7972f16dde2220': logd: insert order for first entry
| * \ \ \ \ \ \ \ resolved conflicts for merge of 3f95c89d to lmp-dev-plus-aospDmitriy Ivanov2014-10-141-1/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5184dcfa91a11a210c60e60a4fffc26d2c9f116f
| * \ \ \ \ \ \ \ \ am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: Runtime restart while ↵Dianne Hackborn2014-10-142-5/+29
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrolling Instagram * commit '2c5e7e102bc2059d22f8457db68c567b64cec963': Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram
| | * | | | | | | | Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling InstagramDianne Hackborn2014-10-132-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like there were a couple problems in the code: - It would not 0-terminate the string it read, to make sure we didn't see garbage at the end. - It didn't reduce buf_len as it processes data in the buffer, so if we need to read more we will increase the buffer length to be longer than the actual available data. Also put in some logs about every thing we kill, so we can see what is going on when debugging. And add a special check for us trying to kill pid 0 for any reason, since doing so seem to be terminal to the caller. Change-Id: I2fe29bfef08938b8a2eb182475c0705c14d8d84f
| * | | | | | | | | am e7502d32: am 3bcd5694: Merge "Add gtest conformance tests for libsync."Riley Andrews2014-10-110-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e7502d32cfb2f26e24183c709ccfece67bc815e3': Add gtest conformance tests for libsync.
| * \ \ \ \ \ \ \ \ \ am 8218b6aa: newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-101-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8218b6aae9cd4a19fa074a8a8203fe9275b35447': newfs_msdos: Set sectors per fat once
| | * | | | | | | | | newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an issue causing the fat size to shrink too small, causing a fsck check to fail. Bug: 17949028 Bug: 17761281 Change-Id: Id0207f2ab44e57ff81f5a53494b45344822a6495 Signed-off-by: Daniel Rosenberg <drosen@google.com>
| * | | | | | | | | | am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af191cd157f076ee5d99890711e2881a60d7770a': fs_mgr: fix build breakage
| * \ \ \ \ \ \ \ \ \ \ am f7c287b7: am 47d24416: Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f7c287b750a2353976fc51aa3b45b380024ae84b': Fix top for very large VSS.
| * \ \ \ \ \ \ \ \ \ \ \ am 3fe9adc9: Merge "Fix write past end of memory." into lmp-devChristopher Ferris2014-10-071-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3fe9adc932948da8993d3f812bce1875efc47c0e': Fix write past end of memory.
| | * | | | | | | | | | | Merge "Fix write past end of memory." into lmp-devChristopher Ferris2014-10-071-9/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix write past end of memory.Christopher Ferris2014-10-071-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The computed flattened size of the blob does not match the size used by the flatten function when the last cached entry size is not 4 byte aligned. Bug: 17873145 Change-Id: I9f9fc102d4bde4681ae977b6de5f263aaaf56708
| * | | | | | | | | | | | | am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-10-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4105613009614ed7a6622017a592b7bd728b1345': DO NOT MERGE Restore libcorkscrew unwinding.
| | * | | | | | | | | | | | am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-10-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a69c1db365323f984c6a8afd1fc035551e96d99': DO NOT MERGE Restore libcorkscrew unwinding.
| | | * | | | | | | | | | | | DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15701117 Change-Id: I1d2164726b8f421d8e6741b84749fddb86b60809
| * | | | | | | | | | | | | | am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be ↵Christopher Ferris2014-10-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created. * commit 'bf1f5cb928bc2dc92187b85b4aa04650475a857b': Log stack even if tombstone cannot be created.
| | * | | | | | | | | | | | | am 290efd24: (-s ours) Log stack even if tombstone cannot be created.Christopher Ferris2014-10-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '290efd244d8af18811b2ef2dac8f30cc7a37e066': Log stack even if tombstone cannot be created.
| | | * | | | | | | | | | | | Log stack even if tombstone cannot be created.Christopher Ferris2014-05-091-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14498701 (cherry picked from commit c5bb49a138a78442e7326dfb6bbf85feadf0d486) Conflicts: debuggerd/tombstone.cpp Change-Id: I888b3d683c3b880357b0b24f9204a9cca3e8f3be
| * | | | | | | | | | | | | | am b2a5d839: am a083c857: Merge changes I7d0b85b5,I74796043Mark Salyzyn2014-10-071-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2a5d839ec27c112ab3b0929ee4cf117a876a547': logd: LogStatistics leak logd: kill(0,0) issue
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 332bdffa: am 09dc0633: Merge changes I74796043,I74796043Mark Salyzyn2014-10-066-69/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '332bdffa4fd2f3c12bd501cdd92c037d337f3cc7': logd: Add control statistics enable/disable. logd: cleanup
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-065-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad0ff1d99cd00ce53f667b27e53f44e802315a36': Add -no-integrated-as at local level.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot ↵Mike Lockwood2014-10-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sound" into lmp-dev * commit '7569b7b39f4f12cc4e87525113c82dae65c0b250': Add bootanimation to audio group so it can play boot sound
| | * | | | | | | | | | | | | | | | Merge "Add bootanimation to audio group so it can play boot sound" into lmp-devMike Lockwood2014-10-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Add bootanimation to audio group so it can play boot soundMike Lockwood2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17674304 Change-Id: I5d31bc024fa36fedac2c0ba5c4a8b100937183ad
| * | | | | | | | | | | | | | | | | am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message."Elliott Hughes2014-10-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85cac2abd416120646b0fe058aac812ca517d71b': Fix a typo in ioctl usage message.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-10-049-132/+1040
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '072877af485d49f11e227c0d22a7bb4a341533d6': Revert "Rewrite atomic.h to use stdatomic.h."
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-049-1040/+132
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5204549faf7310cc808bcb3676fb36268178e26': Rewrite atomic.h to use stdatomic.h.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c263e671: Merge "init.trace.rc: fix race condition with class_start core" ↵Jesse Hall2014-10-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'c263e671dfbc5d968275f6c088f05c21d1528325': init.trace.rc: fix race condition with class_start core
generated by cgit v1.1 at 2025-01-28 22:59:40 +0000