Elliott Hughes
d40c7560e4
am 1ff2df3f: am 82a2687a: Merge "Fix cp(1) for files in /proc."
...
* commit '1ff2df3f642018277066d73fcd57db08d41d387f':
Fix cp(1) for files in /proc.
2014-07-22 20:36:12 +00:00
Elliott Hughes
1ff2df3f64
am 82a2687a: Merge "Fix cp(1) for files in /proc."
...
* commit '82a2687a3c7eb39549b07153cf6a87ce5f3b507f':
Fix cp(1) for files in /proc.
2014-07-22 20:32:13 +00:00
Sreeram Ramachandran
c7e85bf5e3
am 1575e163: am 34627d82: Merge "Stop and start netd explicitly for "adb shell stop/start"."
...
* commit '1575e1639c7c72f042fe20f0d862f53b55ded651':
Stop and start netd explicitly for "adb shell stop/start".
2014-07-22 20:09:20 +00:00
Sreeram Ramachandran
1575e1639c
am 34627d82: Merge "Stop and start netd explicitly for "adb shell stop/start"."
...
* commit '34627d82d784ae2a71a1b2fc66e8eea5a25cd38d':
Stop and start netd explicitly for "adb shell stop/start".
2014-07-22 20:05:46 +00:00
Riley Andrews
9140aaef15
am 67cb1aea: Remove the /dev/.booting file before triggering boot.
...
* commit '67cb1aeaa5bb8dbd43d5a1bfb21d1a8c39822fb6':
Remove the /dev/.booting file before triggering boot.
2014-07-22 18:22:05 +00:00
Sreeram Ramachandran
34627d82d7
Merge "Stop and start netd explicitly for "adb shell stop/start"."
2014-07-22 16:35:00 +00:00
Elliott Hughes
82a2687a3c
Merge "Fix cp(1) for files in /proc."
2014-07-22 16:18:32 +00:00
Elliott Hughes
1dc64f7a46
Fix cp(1) for files in /proc.
...
Also modernize the Android-specific hacks.
Bug: https://code.google.com/p/android/issues/detail?id=70793
Change-Id: I2aebcd2ff10ca2466017379d87f5fabdb77c05e2
2014-07-22 13:27:16 -07:00
Riley Andrews
67cb1aeaa5
Remove the /dev/.booting file before triggering boot.
...
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
2014-07-22 00:23:30 -07:00
Nick Kralevich
85009f34e6
am 98a62656: am ec331b1e: Merge "adb: set O_CLOEXEC on lots of file descriptors"
...
* commit '98a6265628aa80255f9dda4df835a114c6a94354':
adb: set O_CLOEXEC on lots of file descriptors
2014-07-22 02:51:57 +00:00
Nick Kralevich
98a6265628
am ec331b1e: Merge "adb: set O_CLOEXEC on lots of file descriptors"
...
* commit 'ec331b1e401db984c00eb8f265146e889f29ad20':
adb: set O_CLOEXEC on lots of file descriptors
2014-07-22 02:48:15 +00:00
Nick Kralevich
8d36649864
am ef16a17a: Merge "adb: set O_CLOEXEC on lots of file descriptors" into lmp-dev
...
* commit 'ef16a17afb8894776ce0be88b8a9ea705f9d64e5':
adb: set O_CLOEXEC on lots of file descriptors
2014-07-22 02:43:24 +00:00
Colin Cross
9321e484df
am 5dd4f875: am 02c7113d: Merge "adb: replace utimes() with utime()"
...
* commit '5dd4f875c1e8c088ac704d68e9f7a0c58200316d':
adb: replace utimes() with utime()
2014-07-22 00:17:36 +00:00
Colin Cross
5dd4f875c1
am 02c7113d: Merge "adb: replace utimes() with utime()"
...
* commit '02c7113deea592081c09aca90771670db8918d6c':
adb: replace utimes() with utime()
2014-07-22 00:14:39 +00:00
Colin Cross
44748f2c6a
resolved conflicts for merge of ad1e41d4
to lmp-dev-plus-aosp
...
Change-Id: Ie99f6cc68a613eb287048f17bd423a8f80762645
2014-07-21 16:33:14 -07:00
Colin Cross
ad1e41d48c
am 143b9e3d: Merge changes I1730d1df,I42c18cb5,I03bb5cc1
...
* commit '143b9e3dd6b86d5ac14b6d57588561aed45ab7ca':
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
2014-07-21 23:24:03 +00:00
Nick Kralevich
ec331b1e40
Merge "adb: set O_CLOEXEC on lots of file descriptors"
2014-07-21 15:45:44 +00:00
Nick Kralevich
9866a66d6d
adb: set O_CLOEXEC on lots of file descriptors
...
Too many leaking FDs.
Fixes bug: https://code.google.com/p/android/issues/detail?id=65857
(and more)
(cherrypicked from commit fe8d7f4f2e
)
Change-Id: I67d8683244e54288a8105f6f65ee40abe2378d7e
2014-07-21 19:34:31 -07:00
Colin Cross
02c7113dee
Merge "adb: replace utimes() with utime()"
2014-07-21 15:45:44 +00:00
Greg Hackmann
7046773595
adb: replace utimes() with utime()
...
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
2014-07-21 17:10:34 -07:00
Colin Cross
143b9e3dd6
Merge changes I1730d1df,I42c18cb5,I03bb5cc1
...
* 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
2014-07-21 15:45:37 +00:00
Nick Kralevich
ef16a17afb
Merge "adb: set O_CLOEXEC on lots of file descriptors" into lmp-dev
2014-07-21 15:42:19 +00:00
Hans Boehm
7485211084
am b14f65cb: Do not typedef char16_t if it is a keyword.
...
* commit 'b14f65cb50d020982866cb2ca0f932171abc7aa1':
Do not typedef char16_t if it is a keyword.
2014-07-20 18:02:22 +00:00
Elliott Hughes
a293359b79
am c11146ef: Fix implicit declaration of function \'prctl\' in logd.
...
* commit 'c11146efdf41b2f2b5cabc00acbb90ee11fd1c8d':
Fix implicit declaration of function 'prctl' in logd.
2014-07-20 18:00:53 +00:00
Elliott Hughes
8844dac341
am cbbb83b0: Fix implicit declaration of function \'prctl\' in adb.
...
* commit 'cbbb83b0eb8b09b729c9287238d709bec7b833b5':
Fix implicit declaration of function 'prctl' in adb.
2014-07-20 02:19:23 +00:00
Sreeram Ramachandran
018c6a57f3
Stop and start netd explicitly for "adb shell stop/start".
...
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
2014-07-19 18:36:32 +00:00
Rom Lemarchand
1b3f2ff028
adb: use oom_score_adj instead of oom_adj
...
(cherry picked from commit 07ce7cab72
)
Change-Id: I1730d1df34039a5502200002ac813ce96a3eaa1a
2014-07-18 21:55:38 -07:00
Jeff Sharkey
eb97987332
Add "exec" service: shell commands with no pty.
...
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 5d9d434efa
)
Change-Id: I42c18cb5bb907449b458c94450ef6c584d84ecdb
2014-07-18 21:46:23 -07:00
Lajos Molnar
4b35c01e3e
adb: added support for adb pull -a to preserve time stamps and mode
...
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 de8ff4adca
)
Change-Id: I03bb5cc14ce542299cf3b221a8be318a28ee8a8d
2014-07-18 21:46:18 -07:00
Nick Kralevich
fe8d7f4f2e
adb: set O_CLOEXEC on lots of file descriptors
...
Too many leaking FDs.
Fixes bug: https://code.google.com/p/android/issues/detail?id=65857
(and more)
Change-Id: I67d8683244e54288a8105f6f65ee40abe2378d7e
2014-07-18 20:57:35 -07:00
Hans Boehm
b14f65cb50
Do not typedef char16_t if it is a keyword.
...
Don't define char16_t on platforms where char16_t is a keyword, as
C11 and C++11 define it to be.
(cherry picked from commit dfdbe61d28
)
Change-Id: I6717bc2133c1363ecd85861f3869e1eabd2ce96a
2014-07-18 17:53:02 -07:00
Elliott Hughes
663af03a76
am 840d4f2c: am d8b00c89: Merge "Fix implicit declaration of function \'prctl\' in logd."
...
* commit '840d4f2c49da75c994e73728978f0539126c2fc9':
Fix implicit declaration of function 'prctl' in logd.
2014-07-19 00:48:19 +00:00
Elliott Hughes
840d4f2c49
am d8b00c89: Merge "Fix implicit declaration of function \'prctl\' in logd."
...
* commit 'd8b00c89bfe7fb09fa85b458f2232e25127c15dd':
Fix implicit declaration of function 'prctl' in logd.
2014-07-19 00:43:51 +00:00
Elliott Hughes
c11146efdf
Fix implicit declaration of function 'prctl' in logd.
...
(cherry picked from commit e5a0f2064b
)
Change-Id: Iee202daf3c637271a30ba0271abe68e939b5a887
2014-07-18 17:40:52 -07:00
Elliott Hughes
c3f0821fbd
am c67a6425: am fd62d07d: Merge "Fix implicit declaration of function \'prctl\' in adb."
...
* commit 'c67a6425854560f7fd0bfac9d51263bd09a22552':
Fix implicit declaration of function 'prctl' in adb.
2014-07-18 23:51:31 +00:00
Elliott Hughes
c67a642585
am fd62d07d: Merge "Fix implicit declaration of function \'prctl\' in adb."
...
* commit 'fd62d07db04277bd54485a969b0870221de5c18e':
Fix implicit declaration of function 'prctl' in adb.
2014-07-18 23:48:27 +00:00
Elliott Hughes
cbbb83b0eb
Fix implicit declaration of function 'prctl' in adb.
...
(cherry picked from commit b4dd6ef223
)
Change-Id: Ia64bec746ae8d2c45663f61afb46702838b1e5bf
2014-07-18 16:46:39 -07:00
Daniel Rosenberg
6077698993
am 7677e04e: Merge "newfs_msdos: Added option to cluster-align the start of the root directory" into lmp-dev
...
* commit '7677e04ef6a0796172101b6849d48997c2b9899f':
newfs_msdos: Added option to cluster-align the start of the root directory
2014-07-18 22:08:59 +00:00
Elliott Hughes
7b37a4138f
am 400c3818: Move sched_policy.c off bionic\'s PR_SET_TIMERSLACK_PID.
...
* commit '400c381835b9eed533c67a062d88af5365590f7f':
Move sched_policy.c off bionic's PR_SET_TIMERSLACK_PID.
2014-07-18 02:51:24 +00:00
Elliott Hughes
400c381835
Move sched_policy.c off bionic's PR_SET_TIMERSLACK_PID.
...
Change-Id: I3a27803d46b5b88a10aa8043a114d780ed685e56
2014-07-17 17:15:14 -07:00
Elliott Hughes
8d2136922a
am 4a95a209: am 719fd238: Merge "Added default constructor for log_t."
...
* commit '4a95a209e8fc472461aa75282b486e1860edde19':
Added default constructor for log_t.
2014-07-17 23:09:05 +00:00
Elliott Hughes
4a95a209e8
am 719fd238: Merge "Added default constructor for log_t."
...
* commit '719fd238d82cc612843ff2bd12751555d69dd911':
Added default constructor for log_t.
2014-07-17 23:04:08 +00:00
Elliott Hughes
719fd238d8
Merge "Added default constructor for log_t."
2014-07-17 22:34:52 +00:00
Brigid Smith
c75a02fe3f
Added default constructor for log_t.
...
Bug: 16357258
Change-Id: I39169b35653d2b717fadbcff75978db01cc375ef
2014-07-17 15:49:39 -07:00
Elliott Hughes
fd62d07db0
Merge "Fix implicit declaration of function 'prctl' in adb."
2014-07-17 22:33:54 +00:00
Elliott Hughes
b4dd6ef223
Fix implicit declaration of function 'prctl' in adb.
...
Change-Id: I9f14cabbb36d658510c11833b3314565a2445e10
2014-07-18 16:44:58 -07:00
Elliott Hughes
d8b00c89bf
Merge "Fix implicit declaration of function 'prctl' in logd."
2014-07-17 22:33:42 +00:00
Elliott Hughes
e5a0f2064b
Fix implicit declaration of function 'prctl' in logd.
...
Change-Id: I0f655ad15295739adb8f04ec62c88a220413875e
2014-07-18 17:39:41 -07:00
Daniel Rosenberg
7677e04ef6
Merge "newfs_msdos: Added option to cluster-align the start of the root directory" into lmp-dev
2014-07-17 21:15:46 +00:00
Patrick Tjin
f128a62ca1
am 4415e2a2: Scan all descriptors when checking for fastboot [DO NOT MERGE]
...
* commit '4415e2a2696dd422fbe5511fdcd2f896b3d13595':
Scan all descriptors when checking for fastboot [DO NOT MERGE]
2014-07-17 20:58:57 +00:00