summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 41233fcc: am 294d3f74: Merge "Remove a prehistoric fastboot hack."Elliott Hughes2015-03-191-7/+1
|\ | | | | | | | | * commit '41233fcc35ce8c5efa06348f013c31072505229b': Remove a prehistoric fastboot hack.
| * am 294d3f74: Merge "Remove a prehistoric fastboot hack."Elliott Hughes2015-03-191-7/+1
| |\ | | | | | | | | | | | | * commit '294d3f745274330fc86476332f9431285400be2b': Remove a prehistoric fastboot hack.
| | * Merge "Remove a prehistoric fastboot hack."Elliott Hughes2015-03-191-7/+1
| | |\
| | | * Remove a prehistoric fastboot hack.Elliott Hughes2015-03-191-7/+1
| | |/ | | | | | | | | | | | | | | | | | | If you don't have android-info.txt in your zip file, you're probably not using a current fastboot binary anyway. Change-Id: Ic721dc5f068f704c6792493d1e99f05f907678ba
* | | am f99e47a0: am 445e5ede: Merge "Switch fastboot to libziparchive."Elliott Hughes2015-03-192-26/+22
|\ \ \ | |/ / | | | | | | | | | * commit 'f99e47a0a0604aef2f3b1d07953d5f220662353c': Switch fastboot to libziparchive.
| * | am 445e5ede: Merge "Switch fastboot to libziparchive."Elliott Hughes2015-03-192-26/+22
| |\ \ | | |/ | | | | | | | | | * commit '445e5edeeb7c303ea517752cd5de4c6aac0a2d77': Switch fastboot to libziparchive.
| | * Merge "Switch fastboot to libziparchive."Elliott Hughes2015-03-192-26/+22
| | |\
| | | * Switch fastboot to libziparchive.Elliott Hughes2015-03-182-26/+22
| | | | | | | | | | | | | | | | | | | | Bug: 19765860 Change-Id: I83ea56e3b317893995d7106852b65584f99c0e64
* | | | am 082ac808: am b4ebc475: Merge "Fix memory leak on jdwp_process_free()"Dan Albert2015-03-191-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '082ac80827e538528fd0b9cba362742f62e1f5ff': Fix memory leak on jdwp_process_free()
| * | | am b4ebc475: Merge "Fix memory leak on jdwp_process_free()"Dan Albert2015-03-191-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b4ebc475e678e1dce5e4c78436a0b2fc4813159d': Fix memory leak on jdwp_process_free()
| | * | Merge "Fix memory leak on jdwp_process_free()"Dan Albert2015-03-191-0/+1
| | |\ \
| | | * | Fix memory leak on jdwp_process_free()SungHyun Kwon2015-03-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if many jdwp connection are created(), the memory will be leaked. When it deletes heap memory on jdwp_process_free(), the proc->fde just set to null. so it need to free() in fdevent_destory().
* | | | | am 8e70f63a: am 57bf3109: Merge "Prepare for switching to libziparchive."Elliott Hughes2015-03-197-78/+122
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8e70f63aba8e14f3b40b2a0769522505c1019c33': Prepare for switching to libziparchive.
| * | | | am 57bf3109: Merge "Prepare for switching to libziparchive."Elliott Hughes2015-03-197-78/+122
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '57bf3109db7559f36c7c182cf87fe52c14b98f0d': Prepare for switching to libziparchive.
| | * | | Merge "Prepare for switching to libziparchive."Elliott Hughes2015-03-197-78/+122
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Prepare for switching to libziparchive.Elliott Hughes2015-03-187-78/+122
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19765860 Change-Id: I58249d28fbc4975428d0dcac5107d1994c35676c
* | | | | am 7d79c9f5: am b054582b: Merge "libziparchive: fix issue with a directory ↵Narayan Kamath2015-03-193-1/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | with one file" * commit '7d79c9f54dd0f0b759ca7215a92bc6a13cbd7202': libziparchive: fix issue with a directory with one file
| * | | | am b054582b: Merge "libziparchive: fix issue with a directory with one file"Narayan Kamath2015-03-193-1/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'b054582b90de67a5839345b3a39ad683329f1453': libziparchive: fix issue with a directory with one file
| | * | | Merge "libziparchive: fix issue with a directory with one file"Narayan Kamath2015-03-193-1/+17
| | |\ \ \ | | | |/ / | | |/| |
| | | * | libziparchive: fix issue with a directory with one fileMykola Kondratenko2015-03-193-1/+17
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libziparchive fails to iterate some bootanimation archives reporting invalid offset error. This is caused by failure to process a directory with one file (when name_offset + file_name_length == cd_offset). Change-Id: I2733e7f782c14a6fadd5491bb94318ac968df206
* | | | am c5bdfce1: am ee2e362f: Merge "Remove useless memset from init."Elliott Hughes2015-03-191-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'c5bdfce1396df27086a202b286186ac8e569e7f1': Remove useless memset from init.
| * | | am ee2e362f: Merge "Remove useless memset from init."Elliott Hughes2015-03-191-1/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ee2e362f8be4cbf68bb38fa1916a1f395677c593': Remove useless memset from init.
| | * | Merge "Remove useless memset from init."Elliott Hughes2015-03-191-1/+0
| | |\ \
| | | * | Remove useless memset from init.Elliott Hughes2015-03-181-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia880810bb2c9a976dceeb0ffdba0cb98e69e3c6d
* | | | | am c92420b2: am d9a65a65: Merge "Improving the time to wait for assigning IP ↵Dmitry Shmidt2015-03-191-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | address" * commit 'c92420b23b3006ed2e1ece6020dc9d6daa7bf336': Improving the time to wait for assigning IP address
| * | | | am d9a65a65: Merge "Improving the time to wait for assigning IP address"Dmitry Shmidt2015-03-191-2/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'd9a65a65610cb675b092cd343f04e2176a57c26f': Improving the time to wait for assigning IP address
| | * | | Merge "Improving the time to wait for assigning IP address"Dmitry Shmidt2015-03-191-2/+4
| | |\ \ \
| | | * | | Improving the time to wait for assigning IP addressdaisuke niwa2015-02-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework always spends 600msec for getting IP address. DhcpStateMachine.runDhcp calls NetworkUtils.stopDhcp. After that, it calls NetworkUtils.runDhcp. In this case, wait_for_property of dhcp_utils.c calls three times. At least three times, usleep is called. So move usleep statement after property_get statement. Change-Id: I77ffb9a5a64875b47bb528b494bb60b68c1acb5a
* | | | | | am 71a86444: am 4e0a2523: Merge "liblog: reject empty logging messages"Mark Salyzyn2015-03-191-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '71a86444873968fafda87d6ad5855df42c9ea0f0': liblog: reject empty logging messages
| * | | | | am 4e0a2523: Merge "liblog: reject empty logging messages"Mark Salyzyn2015-03-181-0/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '4e0a252372052f194764c3c0a511e17d22549e6c': liblog: reject empty logging messages
| | * | | | Merge "liblog: reject empty logging messages"Mark Salyzyn2015-03-181-0/+4
| | |\ \ \ \
| | | * | | | liblog: reject empty logging messagesMark Salyzyn2015-03-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A regression after "liblog: Instrument logging of logd write drops" where an empty payload would result in an insufficient iovec to report the write drop. Change-Id: Iffabcfbb0680898d7a42004700e638e9d940ff5f
* | | | | | | am 99063631: am 26c4c905: Merge "Remove chroot from init."Elliott Hughes2015-03-184-12/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '99063631f851a3c12f19aa38091e413bc469f4ff': Remove chroot from init.
| * | | | | | am 26c4c905: Merge "Remove chroot from init."Elliott Hughes2015-03-184-12/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '26c4c905d3fc19b24f12a6aa0e22217f0e73e5de': Remove chroot from init.
| | * | | | | Merge "Remove chroot from init."Elliott Hughes2015-03-184-12/+0
| | |\ \ \ \ \
| | | * | | | | Remove chroot from init.Elliott Hughes2015-03-184-12/+0
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not obviously useful. Let's wait until we have an actual need. Change-Id: I2c75c96314b281e89df25b6ed202b3dd5dfdaf15
* | | | | | | am 757d66d5: am 8b0c8b19: Merge "logd: replace internal CLOCK_MONOTONIC use ↵Mark Salyzyn2015-03-189-66/+77
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with sequence numbers" * commit '757d66d548aedb08322f6606b8b7a9aedff46751': logd: replace internal CLOCK_MONOTONIC use with sequence numbers
| * | | | | | am 8b0c8b19: Merge "logd: replace internal CLOCK_MONOTONIC use with sequence ↵Mark Salyzyn2015-03-189-66/+77
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numbers" * commit '8b0c8b197e31f615d140494a2505b313c621a6ed': logd: replace internal CLOCK_MONOTONIC use with sequence numbers
| | * | | | | Merge "logd: replace internal CLOCK_MONOTONIC use with sequence numbers"Mark Salyzyn2015-03-189-66/+77
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | logd: replace internal CLOCK_MONOTONIC use with sequence numbersMark Salyzyn2015-03-189-66/+77
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - switch to simpler and faster internal sequence number, drops a syscall overhead on 32-bit platforms. - add ability to break-out of flushTo loop with filter return -1 allowing in reduction in reader overhead. Change-Id: Ic5cb2b9afa4d9470153971fc9197b07279e2b79d
* | | | | | am c1e0bf0d: am 5aa097c8: Merge "Remove obsolete files from fs_config\'s list."Elliott Hughes2015-03-181-7/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c1e0bf0df36d1cd00104a0761d9fa251ebe4865c': Remove obsolete files from fs_config's list.
| * | | | | am 5aa097c8: Merge "Remove obsolete files from fs_config\'s list."Elliott Hughes2015-03-181-7/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5aa097c8a7b9326e1add7a23bf4d31febd25127b': Remove obsolete files from fs_config's list.
| | * | | | Merge "Remove obsolete files from fs_config's list."Elliott Hughes2015-03-181-7/+0
| | |\ \ \ \
| | | * | | | Remove obsolete files from fs_config's list.Elliott Hughes2015-03-181-7/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: I83716f48754de889d811d74074f9a32dc666c05e
* | | | | | am 169d029c: am 789c99a4: Merge "Switch init over to _PATH_DEFPATH."Elliott Hughes2015-03-182-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '169d029c763a7e652e6d22ae42bb23707675541b': Switch init over to _PATH_DEFPATH.
| * | | | | am 789c99a4: Merge "Switch init over to _PATH_DEFPATH."Elliott Hughes2015-03-182-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '789c99a48e185a1e74af5fe9f837944bf4bf6b57': Switch init over to _PATH_DEFPATH.
| | * | | | Merge "Switch init over to _PATH_DEFPATH."Elliott Hughes2015-03-182-1/+3
| | |\ \ \ \
| | | * | | | Switch init over to _PATH_DEFPATH.Elliott Hughes2015-03-172-1/+3
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19564110 Change-Id: I343b4a360b10319dca13ab01f2d411ff940e9052
* | | | | | am bf8557c8: am 26746a46: Merge "Print the build id of shared libraries if ↵Christopher Ferris2015-03-184-61/+229
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present." * commit 'bf8557c895a21ed35ea90851242571a7a3661278': Print the build id of shared libraries if present.
| * | | | | am 26746a46: Merge "Print the build id of shared libraries if present."Christopher Ferris2015-03-184-61/+229
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '26746a4621e91dbadaaec945025e1f87b959333b': Print the build id of shared libraries if present.