Elliott Hughes
cc1ef0afae
Merge "Pass screen to the device." am: c40f213b67
...
am: 1fd0ea9e0e
* commit '1fd0ea9e0ef5ac01d23c8019c854763693dea6f1':
Pass $TERM to the device.
2015-11-16 23:52:47 +00:00
Elliott Hughes
1fd0ea9e0e
Merge "Pass screen to the device."
...
am: c40f213b67
* commit 'c40f213b67cb12a8771845ec2c609e060d9c19b0':
Pass $TERM to the device.
2015-11-16 23:47:58 +00:00
Elliott Hughes
c40f213b67
Merge "Pass $TERM to the device."
2015-11-16 23:42:52 +00:00
David Pursell
951d1f06c6
Merge "fastboot: create Transport object (take 2)." am: 7a75f4e3a5
...
am: 9c4f9392e1
* commit '9c4f9392e112ccf105a096b5cdd77afe9e873be2':
fastboot: create Transport object (take 2).
2015-11-16 22:50:13 +00:00
David Pursell
9c4f9392e1
Merge "fastboot: create Transport object (take 2)."
...
am: 7a75f4e3a5
* commit '7a75f4e3a5456fe1a44c551b0b75d2bf9130407c':
fastboot: create Transport object (take 2).
2015-11-16 22:46:56 +00:00
David Pursell
7a75f4e3a5
Merge "fastboot: create Transport object (take 2)."
2015-11-16 22:41:48 +00:00
Bertrand Simonnet
078ea36c4f
Merge "metricsd: Remove dead code." am: 695da48944
...
am: a3e097c9ca
* commit 'a3e097c9ca4800a7c9460a77be98007d9b389221':
metricsd: Remove dead code.
2015-11-16 21:25:31 +00:00
Bertrand Simonnet
a3e097c9ca
Merge "metricsd: Remove dead code."
...
am: 695da48944
* commit '695da489440335ef41649eece4dc4ca5eca3b28a':
metricsd: Remove dead code.
2015-11-16 21:22:24 +00:00
Bertrand Simonnet
695da48944
Merge "metricsd: Remove dead code."
2015-11-16 21:17:58 +00:00
Mark Salyzyn
f3c3bf5dfb
Merge "Revert "liblog: resolve deadlocks"" am: e6cf1c6372
...
am: 52b9f02076
* commit '52b9f0207659c8b23b8edf252152c2e657dfabea':
Revert "liblog: resolve deadlocks"
2015-11-16 19:15:37 +00:00
Mark Salyzyn
52b9f02076
Merge "Revert "liblog: resolve deadlocks""
...
am: e6cf1c6372
* commit 'e6cf1c63726bee6b7ca69d68775f79e16f756ba6':
Revert "liblog: resolve deadlocks"
2015-11-16 19:11:39 +00:00
Mark Salyzyn
e6cf1c6372
Merge "Revert "liblog: resolve deadlocks""
2015-11-16 19:07:47 +00:00
Mark Salyzyn
c2e7d4965f
Revert "liblog: resolve deadlocks"
...
This reverts commit 7a2a307192
.
Bug: 25693940
Change-Id: I9a7c926289e972f80c03c92e33535e1dedaa7381
2015-11-16 19:00:41 +00:00
Elliott Hughes
18ddf5c6a2
Pass $TERM to the device.
...
Unfortunately, this isn't backwards-compatible with the current shell
protocol because we made unknown shell: arguments errors. We could try
to commit the change to make them just warnings first, but how would
we know when everyone was running adbd with that change? Bumping the
protocol version doesn't help because that only affects the code running
on the host. And although we could add another feature to the reported
features, since shell_v2 is still in development, that doesn't seem
worthwhile.
Bug: http://b/25601436
Change-Id: I12b81aa656cd25b91d14ef691dcbd2b7dab49535
2015-11-16 10:55:34 -08:00
David Pursell
0b15663830
fastboot: create Transport object (take 2).
...
(Second upload of this CL; original upload had the wrong version of
usb_windows.cpp that caused a compilation error. Fixed error and
re-tested.)
This CL creates a Transport object to provide a generic interface for
various transports. Specifically this is designed to be able to add UDP
support to fastboot in an upcoming CL without changing the main program
logic.
Also includes some minor code style fixes and replaces malloc/free
in the USB implementation files with smart pointers and std::string.
Bug: http://b/22029765
Change-Id: I1175bbce08690fbd15f51e68166be9b3e9973ea0
2015-11-16 09:31:07 -08:00
Calin Juravle
cdef6fb917
Merge "Don\'t create profiles directory under dalvik-cache." am: 942f8ea84f
...
am: 2a095e186b
* commit '2a095e186b2ff28d3c5a2e5f20f3cf61cc1942f0':
Don't create profiles directory under dalvik-cache.
2015-11-16 11:36:50 +00:00
Calin Juravle
2a095e186b
Merge "Don\'t create profiles directory under dalvik-cache."
...
am: 942f8ea84f
* commit '942f8ea84f3f96c2e2556fe90ebba0ec76730553':
Don't create profiles directory under dalvik-cache.
2015-11-16 11:21:48 +00:00
Calin Juravle
942f8ea84f
Merge "Don't create profiles directory under dalvik-cache."
2015-11-16 11:08:46 +00:00
Gilad Arnold
279a033604
Merge "Fix permissions for /data/nativetest{,64}/tests.txt." am: e32cb1b14c
...
am: 8468b26e73
* commit '8468b26e73a984b5c0554ec972c016da71d75752':
Fix permissions for /data/nativetest{,64}/tests.txt.
2015-11-15 06:25:56 +00:00
Gilad Arnold
8468b26e73
Merge "Fix permissions for /data/nativetest{,64}/tests.txt."
...
am: e32cb1b14c
* commit 'e32cb1b14cb2cfc434ade4b4ec80fc51b49c6762':
Fix permissions for /data/nativetest{,64}/tests.txt.
2015-11-15 06:23:20 +00:00
Gilad Arnold
e32cb1b14c
Merge "Fix permissions for /data/nativetest{,64}/tests.txt."
2015-11-15 06:20:09 +00:00
Gilad Arnold
1bc7888104
Fix permissions for /data/nativetest{,64}/tests.txt.
...
This is not an executable so we have to specifically set its permissions
accordingly.
Bug: 25668833
Change-Id: I502f69bad75b4da4fdc29eb3ebaa42a19ae04d27
2015-11-14 18:25:31 -08:00
David Pursell
c625335411
Merge "Revert "fastboot: create Transport object."" am: 44c58471e4
...
am: 0146f2feb6
* commit '0146f2feb608933f31c9eb1218849190d25f154e':
Revert "fastboot: create Transport object."
2015-11-14 00:35:12 +00:00
David Pursell
0146f2feb6
Merge "Revert "fastboot: create Transport object.""
...
am: 44c58471e4
* commit '44c58471e4c0bf8de8c98980d268e9f5f827e253':
Revert "fastboot: create Transport object."
2015-11-14 00:30:39 +00:00
David Pursell
44c58471e4
Merge "Revert "fastboot: create Transport object.""
2015-11-14 00:18:43 +00:00
David Pursell
c0504e1873
Revert "fastboot: create Transport object."
...
This broke some stuff, will look into it Monday.
This reverts commit 6f233a7799
.
Change-Id: I155bc85d21fda3b0ba1e5e17839059797fb15509
2015-11-14 00:15:57 +00:00
Josh Gao
b5706b5f08
Merge "adb: don\'t pull symlinks." am: 29843cf141
...
am: e01de06892
* commit 'e01de068926c15d6c247a51f76218c3bff9cac1a':
adb: don't pull symlinks.
2015-11-13 23:31:12 +00:00
Josh Gao
e01de06892
Merge "adb: don\'t pull symlinks."
...
am: 29843cf141
* commit '29843cf1412e849978daa0aae4bd56e43f141751':
adb: don't pull symlinks.
2015-11-13 23:27:41 +00:00
Josh Gao
29843cf141
Merge "adb: don't pull symlinks."
2015-11-13 23:22:47 +00:00
Josh Gao
f96dc73b9f
adb: don't pull symlinks.
...
Pulling symlinks was broken for directories, and it doesn't seem like
there's a good way to make it not broken, given that the protocol doesn't
have readlink (and we don't want to create symlinks on Windows, anyway).
The behavior for files doesn't seem to be especially useful, either.
Bug: http://b/25601283
Change-Id: Ie1d27e93dd09cbc0c178623b390041d1cb11f726
2015-11-13 15:17:02 -08:00
Bertrand SIMONNET
ad6ab580b2
metricsd: Remove dead code.
...
We don't report the cpu frequency, we can remove that part of the code.
Bug: 25693224
Test: unit tests.
Change-Id: I510654a74261dbd66b7183ea54eef1e1eadc4d91
2015-11-13 15:12:49 -08:00
David Pursell
426715d3cc
Merge "fastboot: create Transport object." am: f131772a79
...
am: 0aab246b8e
* commit '0aab246b8ebbe676a03fb54b5d78696ba75b6204':
fastboot: create Transport object.
2015-11-13 22:56:58 +00:00
David Pursell
0aab246b8e
Merge "fastboot: create Transport object."
...
am: f131772a79
* commit 'f131772a79f75656d9e7593268e5bdecf40ebec0':
fastboot: create Transport object.
2015-11-13 22:53:22 +00:00
David Pursell
f131772a79
Merge "fastboot: create Transport object."
2015-11-13 22:49:08 +00:00
Daniel Rosenberg
b955d952ca
Merge "Fix fastboot to not add \'-\' before suffix" am: ce24abe261
...
am: ec7fa7b479
* commit 'ec7fa7b479453c6fd55cf794c16202f1c78a91d9':
Fix fastboot to not add '-' before suffix
2015-11-13 21:33:40 +00:00
Daniel Rosenberg
ec7fa7b479
Merge "Fix fastboot to not add \'-\' before suffix"
...
am: ce24abe261
* commit 'ce24abe261cbc9696c7ef61818153b99943d026e':
Fix fastboot to not add '-' before suffix
2015-11-13 21:29:27 +00:00
Daniel Rosenberg
ce24abe261
Merge "Fix fastboot to not add '-' before suffix"
2015-11-13 21:24:39 +00:00
Daniel Rosenberg
996ecd8b7d
Fix fastboot to not add '-' before suffix
...
Change-Id: I9351b385412151498f47ab46a2620f21b9ac38b8
2015-11-13 12:56:19 -08:00
Elliott Hughes
7274d3fdc7
Merge "Improve adb help text and adb backup error reporting." am: 82a2b2441c
...
am: da2319bf4d
* commit 'da2319bf4d8593de1ade95557d77e4680552bb84':
Improve adb help text and adb backup error reporting.
2015-11-13 20:33:43 +00:00
Elliott Hughes
da2319bf4d
Merge "Improve adb help text and adb backup error reporting."
...
am: 82a2b2441c
* commit '82a2b2441ca7684bb22d8b7f72546b4754e817a3':
Improve adb help text and adb backup error reporting.
2015-11-13 20:30:46 +00:00
Elliott Hughes
82a2b2441c
Merge "Improve adb help text and adb backup error reporting."
2015-11-13 20:25:11 +00:00
Elliott Hughes
4f1472652d
Merge "Improve top(1) compatibility and interactive usefulness." am: 4386b890a7
...
am: 2944e58524
* commit '2944e58524836a5fb6468f03160b30983d78bcbd':
Improve top(1) compatibility and interactive usefulness.
2015-11-13 19:33:55 +00:00
Mark Salyzyn
0605278911
Merge "logd: klogd: parse error" am: c6f3b96bd8
...
am: c7017ffbc8
* commit 'c7017ffbc8babb7486e59f88e9b63850c5c977cb':
logd: klogd: parse error
2015-11-13 19:31:02 +00:00
Elliott Hughes
2944e58524
Merge "Improve top(1) compatibility and interactive usefulness."
...
am: 4386b890a7
* commit '4386b890a7b357572305a282772f30a162b5a4af':
Improve top(1) compatibility and interactive usefulness.
2015-11-13 19:31:01 +00:00
Elliott Hughes
4386b890a7
Merge "Improve top(1) compatibility and interactive usefulness."
2015-11-13 19:28:57 +00:00
Mark Salyzyn
c7017ffbc8
Merge "logd: klogd: parse error"
...
am: c6f3b96bd8
* commit 'c6f3b96bd8b9b0ca366009db6b6e497761adb642':
logd: klogd: parse error
2015-11-13 19:28:06 +00:00
Mark Salyzyn
c6f3b96bd8
Merge "logd: klogd: parse error"
2015-11-13 19:22:10 +00:00
David Pursell
6f233a7799
fastboot: create Transport object.
...
This CL creates a Transport object to provide a generic interface for
various transports. Specifically this is designed to be able to add UDP
support to fastboot in an upcoming CL without changing the main program
logic.
Also includes some minor code style fixes and replaces malloc/free
in the USB implementation files with smart pointers and std::string.
Bug: http://b/22029765
Change-Id: I68641af0da7d13db4647f5e20a18d04d67f0b327
2015-11-13 11:08:17 -08:00
Elliott Hughes
56e6813e27
Improve adb help text and adb backup error reporting.
...
Bug: https://code.google.com/p/android/issues/detail?id=188220
Bug: http://b/25677893
Change-Id: If174049e86d65d95db93a6e071c089dcd1d7cd4f
2015-11-13 11:04:10 -08:00
Ruchi Kandoi
6b1c15d7ff
Merge "healthd: Support new PD and USB Type C types" am: ab75edb4ad
...
am: 741df1263e
* commit '741df1263e2903cba9ebbb333d01654107401378':
healthd: Support new PD and USB Type C types
2015-11-13 17:43:18 +00:00