Calin Juravle
a8dcfc0622
Merge "Create a folder to store method traces activated with -Xmethod-trace" am: 7605a56fbc
...
am: 5d1a9688b8
* commit '5d1a9688b8623c12a00b76e2256f5b418aa1dace':
Create a folder to store method traces activated with -Xmethod-trace
2015-11-11 18:16:53 +00:00
Calin Juravle
5d1a9688b8
Merge "Create a folder to store method traces activated with -Xmethod-trace"
...
am: 7605a56fbc
* commit '7605a56fbcf5706b6e2892da9d9dc0fd20efb395':
Create a folder to store method traces activated with -Xmethod-trace
2015-11-11 18:12:03 +00:00
Elliott Hughes
210111a0d0
Merge "Revert "adb/base: fix adb push of Unicode filenames on Win32"" am: fdebc26ad5
...
am: 7d223253cb
* commit '7d223253cbde73317ba2d86cfbb81ec386c1b39a':
Revert "adb/base: fix adb push of Unicode filenames on Win32"
2015-11-11 18:11:58 +00:00
Elliott Hughes
7d223253cb
Merge "Revert "adb/base: fix adb push of Unicode filenames on Win32""
...
am: fdebc26ad5
* commit 'fdebc26ad5c61dd9198960ecda65fddcadc07c80':
Revert "adb/base: fix adb push of Unicode filenames on Win32"
2015-11-11 18:07:39 +00:00
Calin Juravle
7605a56fbc
Merge "Create a folder to store method traces activated with -Xmethod-trace"
2015-11-11 18:07:13 +00:00
Elliott Hughes
fdebc26ad5
Merge "Revert "adb/base: fix adb push of Unicode filenames on Win32""
2015-11-11 18:01:34 +00:00
Elliott Hughes
cc8cd59456
Revert "adb/base: fix adb push of Unicode filenames on Win32"
...
This reverts commit ac9514a452 .
The new gettid dependency caused other breakage.
Change-Id: I74a75e40c30a45beb275f9dd38eb5c7beac15fbd
2015-11-11 18:01:12 +00:00
Elliott Hughes
9d7da02815
Merge "adb/base: fix adb push of Unicode filenames on Win32" am: 332166a31a
...
am: 9cadb93394
* commit '9cadb9339402b96a72bc6a1ecead25f782fa5a53':
adb/base: fix adb push of Unicode filenames on Win32
2015-11-11 17:19:56 +00:00
Elliott Hughes
9cadb93394
Merge "adb/base: fix adb push of Unicode filenames on Win32"
...
am: 332166a31a
* commit '332166a31acea49203a390579de51a055bc05740':
adb/base: fix adb push of Unicode filenames on Win32
2015-11-11 17:15:52 +00:00
Elliott Hughes
332166a31a
Merge "adb/base: fix adb push of Unicode filenames on Win32"
2015-11-11 17:10:01 +00:00
Jon Larimer
2c1c69e7cc
Merge "Add macro to call event logger for errors." into mnc-dev am: d028c6fa7f am: bc1ef58505
...
am: 5c3c0236c3 -s ours
* commit '5c3c0236c3f9ca5748dbc0f26d03b3a7e759b00f':
Add macro to call event logger for errors.
2015-11-11 14:30:06 +00:00
Jon Larimer
5c3c0236c3
Merge "Add macro to call event logger for errors." into mnc-dev am: d028c6fa7f
...
am: bc1ef58505
* commit 'bc1ef5850501c5694f262c3ab844df4cc4846bcc':
Add macro to call event logger for errors.
2015-11-11 13:55:57 +00:00
Jon Larimer
bc1ef58505
Merge "Add macro to call event logger for errors." into mnc-dev
...
am: d028c6fa7f
* commit 'd028c6fa7fe135a3b454a1773ba59cafbba4b49e':
Add macro to call event logger for errors.
2015-11-11 13:46:21 +00:00
Jon Larimer
d028c6fa7f
Merge "Add macro to call event logger for errors." into mnc-dev
2015-11-11 13:42:38 +00:00
Spencer Low
ac9514a452
adb/base: fix adb push of Unicode filenames on Win32
...
ae5a6c06cd made adb push use
android::base::ReadFileToString() for small files, but that API did not
support UTF-8 filenames on Windows, until this fix which does the
following:
- Add android::base::{WideToUTF8,UTF8ToWide}() which are only available
on Windows. The signatures are based on Chromium's APIs of the same
name.
- Add the namespace android::base::utf8 which has versions of APIs that
take UTF-8 strings. To use this, make sure your code is in a namespace
and then do "using namespace android::base::utf8;". On Windows, this will
make calls to open() call android::base::utf8::open(), and on other
platforms, it will just call the regular ::open().
- Make ReadFileToString() and WriteStringToFile() use utf8::open() and
utf8::unlink().
- Adapt unittests from Chromium.
- fastboot needs to link with libcutils because it links with libbase
which depends on libcutils for gettid() for logging.
Change-Id: I1aeac40ff358331d7a1ff457ce894bfb17863904
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-11-10 15:48:54 -08:00
William Luh
f6891c025a
Add macro to call event logger for errors.
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:34:08 +00:00
Christopher Wiley
8831e30b5c
Merge "libutils: Add UNEXPECTED_NULL status_t" am: 2f33e0cb17
...
am: 3a380b4843
* commit '3a380b48437b8e74483e0770caf8b4071de16538':
libutils: Add UNEXPECTED_NULL status_t
2015-11-10 22:30:15 +00:00
Christopher Wiley
3a380b4843
Merge "libutils: Add UNEXPECTED_NULL status_t"
...
am: 2f33e0cb17
* commit '2f33e0cb179de6fe0aa9d50effa73fe00c7a8d24':
libutils: Add UNEXPECTED_NULL status_t
2015-11-10 22:26:15 +00:00
Christopher Wiley
2f33e0cb17
Merge "libutils: Add UNEXPECTED_NULL status_t"
2015-11-10 22:20:54 +00:00
Calin Juravle
9b3e5d59fe
Create a folder to store method traces activated with -Xmethod-trace
...
Bug: 25612377
Change-Id: I370b858594ccc88c12099b23a0d1aac22acd4969
2015-11-10 21:26:40 +00:00
Elliott Hughes
992c0f4b5c
Merge "Add -e to the adb shell documentation." am: 3c540aec24
...
am: eaf0ea050f
* commit 'eaf0ea050f125569f8b5e7dc0fd0eedc75e54a55':
Add -e to the adb shell documentation.
2015-11-10 19:31:39 +00:00
Elliott Hughes
eaf0ea050f
Merge "Add -e to the adb shell documentation."
...
am: 3c540aec24
* commit '3c540aec245f6c010ef2d5e82a22b871335dd1c6':
Add -e to the adb shell documentation.
2015-11-10 19:28:21 +00:00
Elliott Hughes
3c540aec24
Merge "Add -e to the adb shell documentation."
2015-11-10 19:25:14 +00:00
Christopher Wiley
c3441e69c0
libutils: Add UNEXPECTED_NULL status_t
...
We use this specifically in situations where we expect to read
an object from a Parcel, but fail because the object is null.
Bug: 25617251
Change-Id: Id0b6118b19a932998b5028e30dc15d70e4d7f9c3
2015-11-10 11:12:43 -08:00
Elliott Hughes
0e42c2a4ad
Add -e to the adb shell documentation.
...
Change-Id: I7be5d198ef174e969bbb670e629369894c7b0994
2015-11-10 10:54:44 -08:00
Elliott Hughes
4e2131122c
Merge "libpixelflinger: MIPS64r6 bug fix" am: d75b6b9257
...
am: 0942344af0
* commit '0942344af013ad3ab6a8e1cf27e53c8d854ac679':
libpixelflinger: MIPS64r6 bug fix
2015-11-10 15:54:27 +00:00
Elliott Hughes
0942344af0
Merge "libpixelflinger: MIPS64r6 bug fix"
...
am: d75b6b9257
* commit 'd75b6b925748d3a241866a2662f2ec0e4db9101c':
libpixelflinger: MIPS64r6 bug fix
2015-11-10 15:51:35 +00:00
Elliott Hughes
d75b6b9257
Merge "libpixelflinger: MIPS64r6 bug fix"
2015-11-10 15:48:46 +00:00
Ljubomir Papuga
4edb4584a6
libpixelflinger: MIPS64r6 bug fix
...
This commit fixes MIPS64r6 bootanimation crash.
Change-Id: If7ca817ee2beaf92bb8052602cc759bb4a609419
2015-11-10 14:24:11 +01:00
Josh Gao
155d62feb0
Merge "adb: don\'t try to pull character or block devices." am: 0bb1ce06ea
...
am: 85a4b33302
* commit '85a4b333020ecf7bf1b5d25cf741ac607ed3d905':
adb: don't try to pull character or block devices.
2015-11-10 02:35:19 +00:00
Josh Gao
85a4b33302
Merge "adb: don\'t try to pull character or block devices."
...
am: 0bb1ce06ea
* commit '0bb1ce06ea46f14d5b6bc57db8c8d6c463b5b1de':
adb: don't try to pull character or block devices.
2015-11-10 02:32:00 +00:00
Josh Gao
0bb1ce06ea
Merge "adb: don't try to pull character or block devices."
2015-11-10 02:22:47 +00:00
Josh Gao
8d00a39eff
adb: don't try to pull character or block devices.
...
Change-Id: I1a9e2c0097fe9c4017a9b338e812366c8e1154f0
2015-11-09 18:12:10 -08:00
Josh Gao
1a770d624d
Merge "adb: demote skipping a file from an error to a warning." am: 5a08fd35c9
...
am: 234dbb840a
* commit '234dbb840a58d69d551535a3937c1e56f848b344':
adb: demote skipping a file from an error to a warning.
2015-11-10 02:05:32 +00:00
Josh Gao
234dbb840a
Merge "adb: demote skipping a file from an error to a warning."
...
am: 5a08fd35c9
* commit '5a08fd35c9ed77a354dfb4b71ba754dc148716ca':
adb: demote skipping a file from an error to a warning.
2015-11-10 02:03:33 +00:00
Josh Gao
5a08fd35c9
Merge "adb: demote skipping a file from an error to a warning."
2015-11-10 02:02:41 +00:00
Josh Gao
21abf5a7c1
adb: demote skipping a file from an error to a warning.
...
Change-Id: If6c88e8855369bd7feb570ac5310fc7f44994083
2015-11-09 17:47:56 -08:00
Elliott Hughes
1098a6202b
Merge "Fix adb shell escape handling." am: 79964cdf86
...
am: a55d6810b7
* commit 'a55d6810b7e2149ddf792f04ee16980b62e0fc2d':
Fix adb shell escape handling.
2015-11-10 01:11:33 +00:00
Elliott Hughes
a55d6810b7
Merge "Fix adb shell escape handling."
...
am: 79964cdf86
* commit '79964cdf86ce18f5911873249aa5f505be59051f':
Fix adb shell escape handling.
2015-11-10 01:08:48 +00:00
Elliott Hughes
79964cdf86
Merge "Fix adb shell escape handling."
2015-11-10 01:06:58 +00:00
Tom Cherry
ecea12ef6d
Merge "Fix isValid() condition for libsync tests" am: 48f2e1ed31
...
am: b1b0965094
* commit 'b1b0965094cd9b5f23991ddd065eb5128a4dce67':
Fix isValid() condition for libsync tests
2015-11-09 22:36:15 +00:00
Tom Cherry
b1b0965094
Merge "Fix isValid() condition for libsync tests"
...
am: 48f2e1ed31
* commit '48f2e1ed317f6a330b129c788bd19dac2a4df8ad':
Fix isValid() condition for libsync tests
2015-11-09 22:31:44 +00:00
Tom Cherry
48f2e1ed31
Merge "Fix isValid() condition for libsync tests"
2015-11-09 22:27:56 +00:00
Elliott Hughes
28416d6d33
Fix adb shell escape handling.
...
Start of input is, by definition, the start of a line. Give the states
names to make the error clearer. We should also swallow the escape
character until/unless it's proven not to have been part of an escape
sequence. Finally, implement an ssh(1)-like -e option so the user can
choose -- or, more importantly, disable -- escape character handling.
Change-Id: I28a91db47e15f3e7de96303c0b9a98d302b9c92e
2015-11-09 13:57:47 -08:00
Nick Kralevich
7dafe5b818
Merge "Enable hidepid=2 on /proc" am: 2d8f1d4c47
...
am: ea8452cc72
* commit 'ea8452cc720cfcf2d8d1f469bbaafec968202e99':
Enable hidepid=2 on /proc
2015-11-09 20:35:18 +00:00
Nick Kralevich
ea8452cc72
Merge "Enable hidepid=2 on /proc"
...
am: 2d8f1d4c47
* commit '2d8f1d4c478b9d921730d3fc9b290315e2ff9f04':
Enable hidepid=2 on /proc
2015-11-09 20:29:44 +00:00
Nick Kralevich
2d8f1d4c47
Merge "Enable hidepid=2 on /proc"
2015-11-09 20:05:22 +00:00
Elliott Hughes
3396ad2c16
Merge "adb/base: minor compiler portability improvements" am: 892f0e9300
...
am: 8163cbc535
* commit '8163cbc535566e189aa704b21ce38d13b84efee2':
adb/base: minor compiler portability improvements
2015-11-09 18:27:17 +00:00
Elliott Hughes
8163cbc535
Merge "adb/base: minor compiler portability improvements"
...
am: 892f0e9300
* commit '892f0e93007dc912f18a09fd281c73adf762277a':
adb/base: minor compiler portability improvements
2015-11-09 18:25:22 +00:00
Elliott Hughes
892f0e9300
Merge "adb/base: minor compiler portability improvements"
2015-11-09 18:22:42 +00:00