Commit Graph

20359 Commits

Author SHA1 Message Date
Mark Salyzyn 1325ebfab2 Revert "logcat: expand -n, -r and -b"
This reverts commit 33c262513f.

Bug: 28120456
Bug: 22654233
Change-Id: I2a13f009d9e08dc2389b9872e45e95e0563af22f
2016-06-08 08:22:19 -07:00
Elliott Hughes 6bf8d26c82 Merge "Allow multiple (sequential) adb users on Linux." 2016-06-08 14:24:59 +00:00
Elliott Hughes d89a6c2285 Allow multiple (sequential) adb users on Linux.
Before this, adb will fail to start for the second user who tries because
/tmp/adb.log already exists and isn't writable by the second user.

Also allow $TMPDIR to override the use of /tmp.

Bug: https://code.google.com/p/android/issues/detail?id=211420
Change-Id: Ic53da981ac0fa45bfed62e7b351d75dca0540235
2016-06-07 14:53:21 -07:00
Mattias Nissler 35d84096e9 Merge "fs_mgr: Remove incorrect free() on error paths in load_key()" 2016-06-07 21:00:03 +00:00
Treehugger Robot 04045fd4d1 Merge "libnetutils: Add synchronization per socket full operation" 2016-06-07 19:13:48 +00:00
Treehugger Robot 4ab7548406 Merge "init: Add support for ${x.y:-default} expansion" 2016-06-07 19:03:41 +00:00
Mark Salyzyn 4b56162a33 init: Add support for ${x.y:-default} expansion
commit 00ede7d262 (init: do
expand_props before calling the builtins) broke logpersist

Bug: 28120456
Bug: 22654233
Change-Id: Ib4d8231665b26ac083b02243177493fab41c8978
2016-06-07 18:09:17 +00:00
Dmitry Shmidt 4f831e2cfb libnetutils: Add synchronization per socket full operation
Take and release mutex between ifc_init() and ifc_close()
calls to prevent global ifc_ctl_sock override.

Bug: 22307208

(cherry-pick of cebcd450c6ca3de5106ef3d817d5b760f5d57fbe.)

Change-Id: Iacffd329ce2a51defa550c7e33277332045a7b9b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2016-06-07 10:11:59 -07:00
Treehugger Robot b67fed557f Merge "fs_mgr: fix encryptable=footer support" 2016-06-07 16:49:39 +00:00
Elliott Hughes bb1e7977fb Merge "Use alignas for alignment." 2016-06-07 15:41:28 +00:00
Mattias Nissler 31404e58e9 fs_mgr: Remove incorrect free() on error paths in load_key()
This fixes a bug introduced by
https://android-review.googlesource.com/#/c/212781/ which would make
fs_mgr crash when hitting one of the error paths.

Bug: 28585197
Change-Id: I40e6612e2eb3e6f584e70c608afc6d4378d73c4f
2016-06-07 16:37:48 +02:00
Elliott Hughes ebe636e5ce Merge "use process groups for processes started by init" 2016-06-07 03:03:07 +00:00
Elliott Hughes 5f4a946c09 Use alignas for alignment.
Change-Id: I427c407a188682a360c74b2bd5a44dd62551ea66
2016-06-06 19:59:45 -07:00
Collin Mulliner f7e79b99c1 use process groups for processes started by init
Put every service into a process group, kill the process group
and all child processes created within the group when killing the
service. Removed libutil dependency in libprocessgroup.

Bug: 25355957
Change-Id: Ieed60ec41579f638ab9b1e66a7e6330ed578ab05
Signed-off-by: Collin Mulliner <collinrm@squareup.com>
2016-06-06 16:31:01 -07:00
David Pursell 605628d325 Merge "adbd: properly close subprocess pipes on Ctrl+C." 2016-06-06 21:06:11 +00:00
David Pursell f2aa186c7b adbd: properly close subprocess pipes on Ctrl+C.
When non-interactive sessions exit via Ctrl+C, adbd sends SIGHUP
to the child process to let it know to exit. However, adbd was not
closing the pipes to the child process, so if the subprocess ignored
SIGHUP and continued writing it could fill up the pipe and block
forever while adbd waits for it to exit.

This CL adds the necessary calls to close the subprocess pipe after
sending SIGHUP.

Bug: 28981563
Change-Id: I318e322e563241052648361172f4859c297837fb
2016-06-06 09:59:34 -07:00
Treehugger Robot 0fdd663262 Merge "Remove toolbox ioctl." 2016-06-04 16:14:39 +00:00
Elliott Hughes 1f406e270f Remove toolbox ioctl.
Let's remove this convenient tool for attacking buggy kernels and see if
anyone with a legitimate use notices. I suspect most potential legitimate
users write a short C program instead anyway.

Bug: http://b/29128170
Change-Id: I14e8b8594902951fe0b94c9ce13baa2c4d7b9e6e
2016-06-04 08:12:34 -07:00
Treehugger Robot 68285c0033 Merge "logpersist: switch to pgrep from ps" 2016-06-03 21:34:01 +00:00
Treehugger Robot 310da0b990 Merge "cutils: don't fortify property_get on clang." 2016-06-03 19:29:12 +00:00
Josh Gao 74ebdf3c8e cutils: don't fortify property_get on clang.
clang doesn't do the frontend inlining/dead code elimination needed for
the fortified implementation to work. Therefore, turn it off.

Bug: http://b/28381737
Change-Id: Ie8dd970e3908b1daaa587ad2bd041e8f6e2089db
2016-06-02 15:29:11 -07:00
Mark Salyzyn 1d945119c0 logpersist: switch to pgrep from ps
Changes expected output from a line cut from the less than portable
ps output to reporting the pid of logcatd (uid=logd comm=logcat).
Preserve reporting an error code if logcatd did not start.

Bug: 29075536
Change-Id: I61aa0a4787d4594c415d2c7db5bbb0e512676bf8
2016-06-02 09:51:13 -07:00
Colin Cross ce5b4fee23 Merge "Remove deprecated Android.mk files" 2016-06-02 16:31:42 +00:00
Treehugger Robot 59e6afc617 Merge "Fix liblog logtags" 2016-06-01 23:28:10 +00:00
Jeffrey Vander Stoep 9292d7dae3 Merge "add a property for controlling perf_event_paranoid" 2016-06-01 23:18:45 +00:00
Dan Willemsen d119101807 Fix liblog logtags
This was broken because we didn't have logtags support in Soong.

Bug: 28989759
Change-Id: I8370a73cf14703b86aafd85e7ea74fc570c3ff0f
2016-06-01 15:32:35 -07:00
Luis Hector Chavez 51814a0142 Merge "core: Update libchrome APIs to r395517" 2016-06-01 21:50:03 +00:00
Treehugger Robot 5d6193c658 Merge "Remove invalid uses of -l and -I" 2016-06-01 21:38:18 +00:00
Dan Willemsen ee2da03e26 Remove invalid uses of -l and -I
LOCAL_LDLIBS should only be used with -l flags for NDK and some host
libraries. Other uses should use LOCAL_SHARED_LIBRARIES.

LOCAL_LDFLAGS should not contain -l entries, they should be in
LOCAL_LDLIBS instead.

LOCAL_CFLAGS should not contain -I entries, those should use
LOCAL_C_INCLUDES instead.

Change-Id: Ic901aa14651572ac682166becd4f0cd86baecc34
2016-06-01 13:41:23 -07:00
Treehugger Robot 58ea31cc90 Merge "fs_mgr: pass sehandle to ext4 format routine" 2016-06-01 17:30:09 +00:00
Daniel Micay 2b22a66382 add a property for controlling perf_event_paranoid
This adds a system property for controlling unprivileged access to
perf_event_paranoid. It depends on adding kernel support for
perf_event_paranoid=3 based on grsecurity's PERF_HARDEN feature to
completely disable unprivileged access to perf. A minimal port of this
feature is used in the vanilla Debian kernel by default.

It hides the non-hardened value as an implementation detail, since while
it is currently 1, it will probably become 2 in the future.

Bug: 29054680

Change-Id: I6e3ae3cf18d8c76df94f879c34fb6fde519b89a9
2016-05-31 17:45:05 -04:00
Treehugger Robot 0f3fde210d Merge "Kill adb's ScopedFd for unique_fd." 2016-05-28 02:06:18 +00:00
Elliott Hughes 2ce86e527b Kill adb's ScopedFd for unique_fd.
It's the adb unique_fd, but at least it's the same API...

Change-Id: If5d6642457e145c450374fde6f1358e5ac386a96
2016-05-27 17:51:24 -07:00
Treehugger Robot b42e4a6b63 Merge "Kill load_file." 2016-05-28 00:17:10 +00:00
Elliott Hughes e8b663fec3 Kill load_file.
Change-Id: I6c332f7d8e94d513605295b3d4d32c4e1cf878dc
2016-05-27 16:14:02 -07:00
Treehugger Robot 9c7f9215e4 Merge "[adb] Followup CL to clean up adb_auth_host.cpp" 2016-05-27 23:08:06 +00:00
Chih-hung Hsieh ac080d2128 Merge "Fix misc-macro-parentheses warnings in init and other core modules." 2016-05-27 22:44:15 +00:00
Yurii Zubrytskyi dace015269 [adb] Followup CL to clean up adb_auth_host.cpp
Get rid of unused includes + replace a fixed-size buffer with an
std::string

(cherry-pick of 049ebb810f466d916ec9e73cdf28624b57a8c25d.)

Change-Id: I4f9927b900a79a012b5d52908b9d22ac3d2a401c
2016-05-27 14:43:26 -07:00
Treehugger Robot 7c0835f66b Merge "[adb] Issue the "auth" emulator command before any other one" 2016-05-27 21:23:56 +00:00
Yurii Zubrytskyi 376b27532c [adb] Issue the "auth" emulator command before any other one
Emulator console now requires authentication; this means
'adb emu ...' commands silently fail because of it.
This CL adds an 'auth <token>' command to each user command,
making sure it won't be silently ignored.

(cherry-pick of a9e2b99a7fdd31bcd6d852c6db26fe592236a24f.)

Bug: https://code.google.com/p/android/issues/detail?id=211233
Change-Id: Id9ca4999fd2e6393cc88278eaf444243e13c0ec0
2016-05-27 13:34:40 -07:00
Colin Cross b50216ed86 Remove deprecated Android.mk files
These directories all have Android.bp files that are always used now,
delete the Android.mk files.

Change-Id: I8b0c89072a660c4a7a30fcefc76a7bbe247df977
2016-05-26 16:58:28 -07:00
Luis Hector Chavez 623ce74c83 core: Update libchrome APIs to r395517
The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.

Change-Id: I0a0e0441b6a7486ff0b42d11136254d8a536788f
2016-05-26 11:29:53 -07:00
Yabin Cui 50e91fec0e Merge "adb: retry connecting disconnected emulators instead of always looping." 2016-05-26 01:32:53 +00:00
Michael Ryleev ed01d17e1b Merge "trusty: storageproxyd: use upstream kernel headers" 2016-05-25 15:40:05 +00:00
Yabin Cui b74c6498aa adb: retry connecting disconnected emulators instead of always looping.
Previously we loop through local ports every second, this patch improves
the strategy by retrying only just disconnected emulators.

Bug: 26468076
Bug: 19974213
Bug: 22920867

Change-Id: I43ccb746922d104202b0f81a3d163d850bbc890e
2016-05-24 16:38:47 -07:00
Michael Ryleev 462461bd28 trusty: storageproxyd: use upstream kernel headers
Force usage of upstream kernel headers to pull in
definition of rpmb related structures.

This change is required until b/25567964 is resolved.

Change-Id: Ic710d32281dcdd093f6308b82ee937143b692613
Bug: 25567964
2016-05-24 14:52:38 -07:00
Michael Ryleev c7878469be Merge changes I40c9ea47,I593aeed5
* changes:
  trusty: storage: add tests
  trusty: storage: add client lib for testing
2016-05-24 19:23:50 +00:00
Treehugger Robot 18013f2083 Merge "adb: close ep0 on disconnection." 2016-05-24 02:32:57 +00:00
Yabin Cui 638420ef31 adb: close ep0 on disconnection.
adbd on device kicks the usb connection when usb IO fails. But to notify
adb on host to reconnect it, adbd needs to close ep0 to reset the usb
connection. Otherwise, adb on host cann't connect the device unless the
usb cable is reconnected or adb host server is restarted.

This can be tested by using `adb reconnect device` command.

Bug: 25935458

Change-Id: I80979d6029e60b9cfd218f7b9b5201810238ec07
(cherry picked from commit 69e97e4bee)
2016-05-23 17:17:46 -07:00
Hans Boehm 069517574e Merge "Fix SharedBuffer. Remove aref." 2016-05-23 22:11:02 +00:00