Commit graph

14274 commits

Author SHA1 Message Date
Riley Andrews
bc2cdfa8a0 am b81c410a: Merge "Added file permissions for binder tracing"
* commit 'b81c410abe92e7ebf227a633002da51bcdc6ea65':
  Added file permissions for binder tracing
2015-08-12 23:36:31 +00:00
Riley Andrews
b81c410abe Merge "Added file permissions for binder tracing" 2015-08-12 23:28:08 +00:00
Riley Andrews
4a4dc5f313 am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
* commit 'a3a193ffd9ee69a8b4dc41a592257bc134bc40da':
  Added shell permisisons for memreclaim tracing
2015-08-12 23:21:58 +00:00
Scott Bauer
cd1d99e268 Added file permissions for binder tracing 2015-08-12 16:20:51 -07:00
Riley Andrews
a3a193ffd9 Merge "Added shell permisisons for memreclaim tracing" 2015-08-12 23:13:38 +00:00
David Pursell
697869c4fd am 6fefa36c: Merge "adb: Fix PTY logic for non-interactive shells."
* commit '6fefa36cf248397377b87b543dc47c1d9dba0eaa':
  adb: Fix PTY logic for non-interactive shells.
2015-08-12 22:22:57 +00:00
David Pursell
6fefa36cf2 Merge "adb: Fix PTY logic for non-interactive shells." 2015-08-12 22:16:20 +00:00
David Pursell
d4093f191b adb: Fix PTY logic for non-interactive shells.
Change `adb shell` so that interactive sessions use a PTY but
non-interactive do not. This matches `ssh` functionality better
and also enables future work to split stdout/stderr for
non-interactive sessions.

A test to verify this behavior is added to test_device.py with
supporting modifications in device.py.

Bug: http://b/21215503
Change-Id: Ib4ba40df85f82ddef4e0dd557952271c859d1c7b
2015-08-12 14:16:22 -07:00
Yabin Cui
87f73de9e9 am 317acfb8: Merge "Remove confusing variable HOST."
* commit '317acfb88065f68bc3030a5624a63ba4cfaab414':
  Remove confusing variable HOST.
2015-08-12 21:04:54 +00:00
Bertrand Simonnet
450ed3e8c0 am eeab5cd5: Merge "metricsd: Remove unused Chrome OS specific files."
* commit 'eeab5cd585ccaef9d1d0e766bf7c36c661421b9a':
  metricsd: Remove unused Chrome OS specific files.
2015-08-12 20:56:52 +00:00
Bertrand Simonnet
d26681c02f am 497e38db: Merge "metricsd: Relicense as Apache 2."
* commit '497e38db9d79e786ffc3916d135c85fc284aeca1':
  metricsd: Relicense as Apache 2.
2015-08-12 20:56:51 +00:00
Yabin Cui
317acfb880 Merge "Remove confusing variable HOST." 2015-08-12 20:55:59 +00:00
Bertrand Simonnet
eeab5cd585 Merge "metricsd: Remove unused Chrome OS specific files." 2015-08-12 20:49:41 +00:00
Bertrand Simonnet
497e38db9d Merge "metricsd: Relicense as Apache 2." 2015-08-12 20:49:16 +00:00
Nick Kralevich
4d74f2cb4c am 0b973da5: Merge "init: add LOCAL_SANITIZE := integer"
* commit '0b973da5324a7f869fe9cf62c95241e502c91902':
  init: add LOCAL_SANITIZE := integer
2015-08-12 19:15:18 +00:00
Nick Kralevich
0b973da532 Merge "init: add LOCAL_SANITIZE := integer" 2015-08-12 19:09:58 +00:00
Elliott Hughes
c01231b399 am 2fb00423: Merge "Always include the adb version in the log."
* commit '2fb00423d4760b36c5c991afe6789d26bf20cc70':
  Always include the adb version in the log.
2015-08-12 17:35:42 +00:00
Elliott Hughes
2fb00423d4 Merge "Always include the adb version in the log." 2015-08-12 17:02:59 +00:00
Elliott Hughes
42ae2604f4 Always include the adb version in the log.
"Are you running the right version?" seems to be a common cause of debugging
confusion.

Change-Id: I4a4ba95e876dafc05e515058ca059ea370273f78
2015-08-12 08:32:10 -07:00
Elliott Hughes
70af6e0bad am 9508dcb9: Merge "adb: make stdin/stdout/stderr redirection errors fatal"
* commit '9508dcb9aa543511af90fd61c5f6663ff2a1c4cb':
  adb: make stdin/stdout/stderr redirection errors fatal
2015-08-12 15:22:48 +00:00
Elliott Hughes
9508dcb9aa Merge "adb: make stdin/stdout/stderr redirection errors fatal" 2015-08-12 15:18:34 +00:00
Mark Salyzyn
e49aba5413 am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages"
* commit '95e7cb5b8e8fa67eb32377325fa6fa8472500baa':
  healthd: logd: add timestamp to kernel logged battery messages
2015-08-12 14:25:19 +00:00
Mark Salyzyn
95e7cb5b8e Merge "healthd: logd: add timestamp to kernel logged battery messages" 2015-08-12 14:17:38 +00:00
Spencer Low
155159c545 adb: make stdin/stdout/stderr redirection errors fatal
Make these fatal errors:

- Win32 GetTempPathW() failures.

- Errors opening /dev/null (and don't use LOG(FATAL) for this error
  since that will do a crash-dump on Windows which isn't appropriate for a
  transient runtime error).

- Errors with dup2.

- Errors opening adb.log.

Change-Id: Ided76a5436d8c6f059d8f6799c49ba04c87181ae
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-08-11 23:36:55 -07:00
Elliott Hughes
8bb6b3e1ff am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled"
* commit 'b62f6c2a1cc9f7697abb6fc5c74565da6631e0dd':
  adb: call android::base::InitLogging even when adb tracing is disabled
2015-08-12 03:23:22 +00:00
Elliott Hughes
b62f6c2a1c Merge "adb: call android::base::InitLogging even when adb tracing is disabled" 2015-08-12 03:20:04 +00:00
Dan Albert
e78292f2c5 am cef3508b: Merge "Add missing includes."
* commit 'cef3508bb69ec644f35de9d165dc91b127820d77':
  Add missing includes.
2015-08-12 02:00:52 +00:00
Dan Albert
cef3508bb6 Merge "Add missing includes." 2015-08-12 01:50:15 +00:00
Mark Salyzyn
c54821388d am ea56594c: Merge "logd: sizes > 1M prune in smaller batches"
* commit 'ea56594c947484f6d34729e85aaf4804d33dceea':
  logd: sizes > 1M prune in smaller batches
2015-08-11 23:59:24 +00:00
Nick Kralevich
aea73db1e3 init: add LOCAL_SANITIZE := integer
Call abort() on undefined or sketchy integer behavior.
Protects against integer overflow attacks.

Change-Id: I5f542089753c8fcf7596fd70cfaa48a3caa5b140
2015-08-11 16:55:56 -07:00
Mark Salyzyn
ea56594c94 Merge "logd: sizes > 1M prune in smaller batches" 2015-08-11 23:51:31 +00:00
Dan Albert
af9ba4dc6c Add missing includes.
Leaky header cleanup in libc++ means we don't get unistd.h
transitively any more.

Change-Id: I596c24eff418302b19afab6ad3caa55f52241e7c
2015-08-11 16:39:57 -07:00
Mark Salyzyn
62ab0fd4ef logd: sizes > 1M prune in smaller batches
Switch to 1% batch sizes from 10% when individual buffer size > 1M

Bug: 22351810
Change-Id: Ifee570a54643ceb0ba767e1787e937f70cc90b72
2015-08-11 16:20:54 -07:00
Spencer Low
7430916098 adb: call android::base::InitLogging even when adb tracing is disabled
This is a follow-up to https://android-review.googlesource.com/153623
which prevented android::base::InitLogging() from being called when
tracing was disabled.

It is ok to call InitLogging() on a device or host because calling it
does not imply that a logging file is used, which was the reason for
not calling it on a device.

So this change should preserve the device behavior of not using a
logging file when tracing is disabled, plus it will call InitLogging()
all the time in case logging APIs are called.

Change-Id: I3fd6ba2c567f67a2f111a85f174893fbf866ec57
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-08-11 15:48:15 -07:00
Elliott Hughes
06a9f560d2 am 7989a7c8: Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation"
* commit '7989a7c8d32e90dc2cba952dc59da6b88cf55c8e':
  adb: win32: fix USB device hang when resuming from sleep/hibernation
2015-08-11 21:49:08 +00:00
Elliott Hughes
7989a7c8d3 Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation" 2015-08-11 21:43:32 +00:00
Yabin Cui
661327e8e4 Remove confusing variable HOST.
First, HOST is always 0 in adbd, which matches ADB_HOST=0.
Second, HOST is always 1 when adb_main is called, which matches ADB_HOST=1.
For adb client that doesn't call adb_main, it never touches local_init(),
init_transport_registration() and fdevent_loop(). So the changes in adb.cpp,
services.cpp and transport_local.cpp do nothing with it.
As a conclusion, I think we can remove HOST and use ADB_HOST instead.

Change-Id: Ide0e0eca7468b6c3c130f6b50974406280678b2e
2015-08-11 14:00:15 -07:00
Tom Cherry
ba0f24c717 am 5573e3d8: Merge "init: replace strdup() in parse_config()"
* commit '5573e3d839c25321bafe4390d03d0c1853cf5539':
  init: replace strdup() in parse_config()
2015-08-11 20:59:40 +00:00
Tom Cherry
5573e3d839 Merge "init: replace strdup() in parse_config()" 2015-08-11 20:53:11 +00:00
Yusuke Sato
86ec2a8810 am 162ec8e6: Merge "Ignore adb/*.pyc files"
* commit '162ec8e6377aef8671eaccfb8684a3850dc1c6df':
  Ignore adb/*.pyc files
2015-08-11 20:08:59 +00:00
Yusuke Sato
162ec8e637 Merge "Ignore adb/*.pyc files" 2015-08-11 20:03:27 +00:00
Yusuke Sato
83cd266439 Ignore adb/*.pyc files
Python scripts in system/core/ such as perfboot.py may generate
the files.

Change-Id: I0506d47db414a678f1923e747ddce5acfcd7ce1b
2015-08-11 12:59:58 -07:00
Bertrand Simonnet
e6a1dff215 am f71590ff: Merge "metricsd: Only define the targets on linux."
* commit 'f71590ffbc5b611a7c45fcddc7db3c1915fe3cd5':
  metricsd: Only define the targets on linux.
2015-08-11 18:58:48 +00:00
Bertrand Simonnet
f71590ffbc Merge "metricsd: Only define the targets on linux." 2015-08-11 18:54:41 +00:00
Bertrand SIMONNET
0a94a3bf1c metricsd: Only define the targets on linux.
libchromeos (dependency of metricsd) is only defined for linux.
All metrics target must only be defined on mac too or the build system
will complain.

BUG: 22879597
Change-Id: I5bee816e001518a8053d1dfc7b39cca81a4314fd
2015-08-11 11:45:05 -07:00
Bertrand Simonnet
92b100b3e7 am 3670eab0: Merge "metricsd: Add Android.mk."
* commit '3670eab0ba12471b8eddb894679cac824779dcb1':
  metricsd: Add Android.mk.
2015-08-11 18:11:52 +00:00
Bertrand Simonnet
3670eab0ba Merge "metricsd: Add Android.mk." 2015-08-11 18:05:35 +00:00
Elliott Hughes
3cc101d606 am e329a3ec: Merge "Remove watchprops."
* commit 'e329a3ec1b210d65ea33d67df1928dbffdb1d2d4':
  Remove watchprops.
2015-08-11 02:56:35 +00:00
Elliott Hughes
e329a3ec1b Merge "Remove watchprops." 2015-08-11 02:51:58 +00:00
Elliott Hughes
e8606c85c5 Remove watchprops.
Since watchprops would have to be rewritten anyway in the upcoming properties
rewrite, there seems little point in rewriting it for toybox first. Let's
see how many people actually use watchprops and decide whether it's worth
the effort...

Change-Id: I996e7209bc81633ee66602f09f130226336d9987
2015-08-10 19:27:18 -07:00