Riley Andrews
c1490ad9a0
am 4a4dc5f3: am a3a193ff: Merge "Added shell permisisons for memreclaim tracing"
...
* commit '4a4dc5f313953764079a4020a3791e36ec43ba0c':
Added shell permisisons for memreclaim tracing
2015-08-12 23:26:34 +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
Riley Andrews
a3a193ffd9
Merge "Added shell permisisons for memreclaim tracing"
2015-08-12 23:13:38 +00:00
David Pursell
6eef56fb7a
am 697869c4: am 6fefa36c: Merge "adb: Fix PTY logic for non-interactive shells."
...
* commit '697869c4fde93a23cda3a0d789c1f101f82eb157':
adb: Fix PTY logic for non-interactive shells.
2015-08-12 22:29:00 +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
63a29199f3
am 87f73de9: am 317acfb8: Merge "Remove confusing variable HOST."
...
* commit '87f73de9e9b0a74e4b963e8b49d90bbe81a38bb0':
Remove confusing variable HOST.
2015-08-12 21:09:13 +00:00
Bertrand Simonnet
f236bdda07
am 450ed3e8: am eeab5cd5: Merge "metricsd: Remove unused Chrome OS specific files."
...
* commit '450ed3e8c00a77e40d410311ad698961d3c04537':
metricsd: Remove unused Chrome OS specific files.
2015-08-12 21:05:09 +00:00
Bertrand Simonnet
833992023c
am d26681c0: am 497e38db: Merge "metricsd: Relicense as Apache 2."
...
* commit 'd26681c02f3d8e6d1115aaff5d72829886237c30':
metricsd: Relicense as Apache 2.
2015-08-12 21:05:07 +00: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
864d4985ed
am 4d74f2cb: am 0b973da5: Merge "init: add LOCAL_SANITIZE := integer"
...
* commit '4d74f2cb4c30aaf4dfd176b2f970dbf54e5c697d':
init: add LOCAL_SANITIZE := integer
2015-08-12 19:22:11 +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
efc8077246
am c01231b3: am 2fb00423: Merge "Always include the adb version in the log."
...
* commit 'c01231b399c38f00afe0872b3a51837518b713dc':
Always include the adb version in the log.
2015-08-12 17:45:41 +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
f000f7b250
am 70af6e0b: am 9508dcb9: Merge "adb: make stdin/stdout/stderr redirection errors fatal"
...
* commit '70af6e0bad17c5d90084738950e72243f0ce3806':
adb: make stdin/stdout/stderr redirection errors fatal
2015-08-12 15:29:39 +00: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
1763d1aa78
am e49aba54: am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages"
...
* commit 'e49aba5413419bbc4f87889edd9a12956a932ef8':
healthd: logd: add timestamp to kernel logged battery messages
2015-08-12 14:29:01 +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
9cb4af39af
am 8bb6b3e1: am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled"
...
* commit '8bb6b3e1ffc44336f89eb30cc39a1e96498c7c23':
adb: call android::base::InitLogging even when adb tracing is disabled
2015-08-12 03:31:19 +00: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
97a8cd957f
am e78292f2: am cef3508b: Merge "Add missing includes."
...
* commit 'e78292f2c5a1cffd9fdcb76e5be29f6d14445b93':
Add missing includes.
2015-08-12 02:10:16 +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
5cfda541dd
am c5482138: am ea56594c: Merge "logd: sizes > 1M prune in smaller batches"
...
* commit 'c54821388d685eff70a466cb01b2e8bb3e6c98fe':
logd: sizes > 1M prune in smaller batches
2015-08-12 00:04:27 +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
e6b72a4ef6
am 06a9f560: am 7989a7c8: Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation"
...
* commit '06a9f560d2f19026c398b2ce66cd1ab76b2a4ae7':
adb: win32: fix USB device hang when resuming from sleep/hibernation
2015-08-11 21:55:47 +00: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
Tom Cherry
12e77877e6
am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()"
...
* commit 'ba0f24c71767365ff730b763b9af257bad462809':
init: replace strdup() in parse_config()
2015-08-11 21:05:53 +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