summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Remove invalid 64-bit host objects."Stephen Hines2014-07-223-34/+0
|\ \ \ | |/ / |/| |
| * | Remove invalid 64-bit host objects.Stephen Hines2014-07-223-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16408818 These targets are no longer in use, since we have a proper way to create both 32-bit and 64-bit host libraries in a single build now. Change-Id: Icd09f795acd220de5b5e956a8d8e1b4ab4864fa9
* | | Merge "Switch to NetBSD's kill(1)."Elliott Hughes2014-07-223-154/+272
|\ \ \
| * | | Switch to NetBSD's kill(1).Elliott Hughes2014-07-223-154/+272
| | | | | | | | | | | | | | | | Change-Id: Idd1635673e01758b5a7d34f1fdfbb695296c6164
* | | | Merge "Fix cp(1) for files in /proc."Elliott Hughes2014-07-222-12/+12
|\ \ \ \
| * | | | Fix cp(1) for files in /proc.Elliott Hughes2014-07-222-12/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Also modernize the Android-specific hacks. Bug: https://code.google.com/p/android/issues/detail?id=70793 Change-Id: I2aebcd2ff10ca2466017379d87f5fabdb77c05e2
* | | | Merge "Stop and start netd explicitly for "adb shell stop/start"."Sreeram Ramachandran2014-07-222-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Stop and start netd explicitly for "adb shell stop/start".Sreeram Ramachandran2014-07-192-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | netd is supposed to be restarted when the zygote is restarted (see the "onrestart" section for "service zygote" in init.zygote*.rc). But this only works if you send a restart command (say via "ctl.restart"). "stop && start" != "restart". It seems ingrained in developers to do "stop && start", so we don't have much hope of convincing everyone to switch to "adb shell restart", even if we did add such a toolbox command. Bug: 15855807 Change-Id: I387fe86600f4a2862abc3a05a2ef9a1e7374e21d
* | | Merge "adb: set O_CLOEXEC on lots of file descriptors"Nick Kralevich2014-07-215-16/+16
|\ \ \
| * | | adb: set O_CLOEXEC on lots of file descriptorsNick Kralevich2014-07-215-16/+16
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too many leaking FDs. Fixes bug: https://code.google.com/p/android/issues/detail?id=65857 (and more) (cherrypicked from commit fe8d7f4f2e775d46d61f7c2d29a4e852434984da) Change-Id: I67d8683244e54288a8105f6f65ee40abe2378d7e
* | | Merge "adb: replace utimes() with utime()"Colin Cross2014-07-211-2/+3
|\ \ \
| * | | adb: replace utimes() with utime()Greg Hackmann2014-07-211-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the win_sdk host build by replacing utimes() with utime(). utime() is functionally equivalent to utimes() when dealing with non-fractional second timestamps, and is supported by the Windows CRT. (The Windows CRT uses the nonstandard name _utime(), but mingw creates aliases to the POSIX names.) Change-Id: I513c6c5de05376c34cbb0894a94259acba8ae6f1
* | | Merge changes I1730d1df,I42c18cb5,I03bb5cc1Colin Cross2014-07-217-254/+218
|\ \ \ | |/ / |/| | | | | | | | | | | | | | * changes: adb: use oom_score_adj instead of oom_adj Add "exec" service: shell commands with no pty. adb: added support for adb pull -a to preserve time stamps and mode
| * | adb: use oom_score_adj instead of oom_adjRom Lemarchand2014-07-181-3/+3
| | | | | | | | | | | | | | | | | | (cherry picked from commit 07ce7cab72d9b3e5c701491daf8fd457d035eec8) Change-Id: I1730d1df34039a5502200002ac813ce96a3eaa1a
| * | Add "exec" service: shell commands with no pty.Jeff Sharkey2014-07-185-218/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To facilitate device scripts that want to read/write binary data from the host side, this change introduces a new "exec" service that behaves like "shell" but without creating a pty, which would otherwise mangle binary data. After forking, it hooks up stdin/stdout of the child process to the socket connected through to the host. The adb transport doesn't support shutdown(), so the host can't half-close the socket and wait for device termination. Instead, the host side now has two explicit commands "exec-in" and "exec-out" for either sending or receiving data. Teach host side copy_to_file() to deal with stdin/stdout special cases. Switch device side backup/restore services to use the new create_subproc_raw under the hood. (cherry picked from commit 5d9d434efadf1c535c7fea634d5306e18c68ef1f) Change-Id: I42c18cb5bb907449b458c94450ef6c584d84ecdb
| * | adb: added support for adb pull -a to preserve time stamps and modeLajos Molnar2014-07-183-36/+47
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Added -a flag to adb pull that preserves time and mode. Mode is subjected to umask for security. We only receive modification time from adb server, so creation time will be set to the modification time as well. Signed-off-by: Lajos Molnar <lajos@google.com> (cherry picked from commit de8ff4adcaa487259f9ddcd0eab4d1117d1cca71) Change-Id: I03bb5cc14ce542299cf3b221a8be318a28ee8a8d
* | Merge "Fix implicit declaration of function 'prctl' in logd."Elliott Hughes2014-07-171-2/+1
|\ \
| * | Fix implicit declaration of function 'prctl' in logd.Elliott Hughes2014-07-181-2/+1
|/ / | | | | | | Change-Id: I0f655ad15295739adb8f04ec62c88a220413875e
* | Merge "Fix implicit declaration of function 'prctl' in adb."Elliott Hughes2014-07-171-1/+1
|\ \
| * | Fix implicit declaration of function 'prctl' in adb.Elliott Hughes2014-07-181-1/+1
|/ / | | | | | | Change-Id: I9f14cabbb36d658510c11833b3314565a2445e10
* | Merge "Added default constructor for log_t."Elliott Hughes2014-07-172-2/+7
|\ \
| * | Added default constructor for log_t.Brigid Smith2014-07-172-2/+7
|/ / | | | | | | | | Bug: 16357258 Change-Id: I39169b35653d2b717fadbcff75978db01cc375ef
* | Merge "Scan all descriptors when checking for fastboot"Patrick Tjin2014-07-161-15/+34
|\ \
| * | Scan all descriptors when checking for fastbootPatrick Tjin2014-07-111-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Linux, the USB code was only looking at the first descriptor when searching for the fastboot interface which caused some devices to not be found. Also clarify some code by using the actual USB structures instead of void or char pointers. Change-Id: I9e4871c4d477ac10ba75bb17a955f176809af289 Signed-off-by: Patrick Tjin <pattjin@google.com>
* | | Merge "Do not typedef char16_t if it is a keyword."Hans Boehm2014-07-161-1/+4
|\ \ \
| * | | Do not typedef char16_t if it is a keyword.Hans Boehm2014-07-161-1/+4
|/ / / | | | | | | | | | | | | | | | | | | Don't define char16_t on platforms where char16_t is a keyword, as C11 and C++11 define it to be. Change-Id: I6717bc2133c1363ecd85861f3869e1eabd2ce96a
* | | Merge "Remove the /dev/.booting file before triggering boot."Riley Andrews2014-07-161-2/+3
|\ \ \
| * | | Remove the /dev/.booting file before triggering boot.Riley Andrews2014-07-161-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | On mako only, there is a race condition such that core + main services must be started after releasing ueventd (by removing /dev/.booting). bug 16304711 bug 16333352
* | | Merge "Add SIGFPE to crasher."Elliott Hughes2014-07-151-1/+5
|\ \ \
| * | | Add SIGFPE to crasher.Elliott Hughes2014-07-151-1/+5
|/ / / | | | | | | | | | | | | Bug: 3399996 Change-Id: I115caf846a47f57984c1b1844104e37d29e6f24e
* | | Merge "Add missing arm64 registers."Elliott Hughes2014-07-153-33/+34
|\ \ \ | |_|/ |/| |
| * | Add missing arm64 registers.Elliott Hughes2014-07-143-33/+34
|/ / | | | | | | | | | | | | | | | | Also fix dumping of arm64's vector registers, which are actually 128 bits wide. Also move the arm/arm64 FP registers to the tombstone. (We've never dumped them at all for the other architectures.) Change-Id: I239a86dd225b47fa90109bc824b7610df67ad812
* | Merge "Move unlink("/dev/.booting") until after filesystems are mounted."Riley Andrews2014-07-142-15/+15
|\ \
| * | Move unlink("/dev/.booting") until after filesystems are mounted.Riley Andrews2014-07-112-15/+15
| |/ | | | | | | | | | | | | Move the unlink out of init.c and into init.rc, so that the file will be removed after all the filesystems with firmware are up. Change-Id: I7442df2042cc2788d0301f00e3c2fba7d6e0e1c7
* | Merge "Add comment to discourage use of cutils/atomic.h."Hans Boehm2014-07-111-2/+33
|\ \ | |/ |/|
| * Add comment to discourage use of cutils/atomic.h.Hans Boehm2014-07-111-2/+33
|/ | | | Change-Id: Ib05c745158fdf5a11fd4697c3665a6370ffc04f5
* Merge "Fix build."Christopher Ferris2014-07-101-1/+1
|\
| * Fix build.Christopher Ferris2014-07-101-1/+1
|/ | | | Change-Id: Ied4adacde94ee10deb30647156f07d46a38fbe1f
* Merge "Sync with upstream grep."Elliott Hughes2014-07-104-19/+19
|\
| * Sync with upstream grep.Elliott Hughes2014-07-104-19/+19
|/ | | | Change-Id: Ie1da2e95ee7e3513afb87f357be983dc80cd1515
* Merge "fix duplicated grep usage printing"Elliott Hughes2014-07-101-1/+0
|\
| * fix duplicated grep usage printingRocky Zhang2014-07-111-1/+0
|/ | | | | Change-Id: I579d2046f96ba8ae9fd0bf8f36e2e2f64da622ea Signed-off-by: Rocky Zhang <zhangyan.hit@gmail.com>
* Merge "logd: test: disable kernel LOGGER"Mark Salyzyn2014-07-101-5/+3
|\
| * logd: test: disable kernel LOGGERMark Salyzyn2014-07-101-5/+3
|/ | | | | Bug: 15384806 Change-Id: I3072d6dd0618fa9ebe151c78a85eb121327f9df3
* Merge "Fix environment variable assignment in init"Elliott Hughes2014-07-102-8/+22
|\
| * Fix environment variable assignment in initJames Morrissey2014-07-102-8/+22
|/ | | | | | | | | | | | | | | | | | | | | The init process allows environment variables to be specified in the rc script globally, via 'export', and for a specific process, via the 'setenv' option. However, the mechanism for assembling the environment simply appended the new variable without checking whether it was already defined, so it was not possible to overwrite an existing entry. This patch fixes that behaviour. Limitations and concerns: The limit of a maximum number of 31 variables is unchanged. Currently, most callers of "add_environment" do not check the return value, but the function now logs the failure rather than failing silently. Change-Id: Ie9a68c37a0f55c5b40e904e695cd35514f67f480
* Merge "adbd: adb root should terminate adbd only if it's debuggable"Badhri Jagan Sridharan2014-07-091-1/+12
|\
| * adbd: adb root should terminate adbd only if it's debuggablejzhuan52014-05-051-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | adb root command will terminate adbd when closing the socket if current user id is not root. This works for userdebug build, as adb root causes re-enumeration. But for user build, adb root command won't cause re-enumeration, and if adbd is terminated and restarted, it will be in offline state, thus it won't send any thing to host. Change-Id: I81216a3b3da888cd9b236060cf745175f6d93c60 Author: jzhuan5 <jin.can.zhuang@intel.com> Signed-off-by: Bo Huang <bo.b.huang@intel.com>
* | Merge "Fix arm emulator "D register out of range for selected VFP version" ↵Elliott Hughes2014-07-092-0/+9
|\ \ | | | | | | | | | build failure."
| * | Fix arm emulator "D register out of range for selected VFP version" build ↵Elliott Hughes2014-07-092-0/+9
|/ / | | | | | | | | | | failure. Change-Id: Ia37cb3f8ecb00a927fa3fc8b4131c158413646e7