Paul Lawrence
fdf93c0631
am cf234dc7: Preserve errno from fsmgr_do_mount
...
* commit 'cf234dc7e081ac4063c3c5ddcdd4da40c82d51cb':
Preserve errno from fsmgr_do_mount
2014-09-12 19:58:47 +00:00
Dan Albert
522c1d340b
am e18ed89e: Merge "Remove makefile cruft."
...
* commit 'e18ed89eae41f9be0f4ddfc77a3c4d68c901925f':
Remove makefile cruft.
2014-09-12 18:49:05 +00:00
Dmitriy Ivanov
209dc08389
am 870cac61: Merge "Add -std=gnu++11 to test cflags"
...
* commit '870cac615884f9c843407b8bb442eb4d6714f6e2':
Add -std=gnu++11 to test cflags
2014-09-12 18:49:00 +00:00
Elliott Hughes
e4bf208ce8
am 082a52b5: Merge "Move libutils over to pthread_gettid_np."
...
* commit '082a52b57fb6d93186338062c179ffadd871f3c6':
Move libutils over to pthread_gettid_np.
2014-09-12 18:48:59 +00:00
Mark Salyzyn
e70851f8a8
am f9b9693b: Merge "liblog: logcat: colored output."
...
* commit 'f9b9693bab9d6d614ac0da12734dca7bab487c44':
liblog: logcat: colored output.
2014-09-12 18:48:58 +00:00
Dan Albert
e18ed89eae
Merge "Remove makefile cruft."
2014-09-12 18:07:26 +00:00
Dmitriy Ivanov
870cac6158
Merge "Add -std=gnu++11 to test cflags"
2014-09-12 17:43:33 +00:00
Dmitriy Ivanov
5f68087efe
Add -std=gnu++11 to test cflags
...
Change-Id: Ife92cea10021658eba6e22a7ebc9e31f3d194a25
2014-09-12 10:39:12 -07:00
Dan Albert
fbb8db2e2a
Remove makefile cruft.
...
Don't manually include stlport, and don't use private bionic headers.
Change-Id: I0fc4e8b34ab449e9ef07c26f71e472fca5640590
2014-09-12 10:36:26 -07:00
Elliott Hughes
082a52b57f
Merge "Move libutils over to pthread_gettid_np."
2014-09-12 17:22:58 +00:00
Elliott Hughes
7bf5f209ce
Move libutils over to pthread_gettid_np.
...
Bug: 17476168
Change-Id: I934d93a023eb00e036ed3cee8c52efaeb17b8915
2014-09-12 10:19:08 -07:00
Mark Salyzyn
f9b9693bab
Merge "liblog: logcat: colored output."
2014-09-12 14:27:49 +00:00
Jeff Brown
55fbad69a1
am c3e6eb21: Merge "Move ABI: line below header when dumping stacks." into lmp-dev
...
* commit 'c3e6eb21b58ae3067ed03358687d1edb851f2abf':
Move ABI: line below header when dumping stacks.
2014-09-12 05:43:08 +00:00
Pierre Zurek
ead88fca6e
liblog: logcat: colored output.
...
This patch adds a new '-v color' option to logcat so that the output is
colored similar to the ones in DDMS. Simply type "adb logcat -v color"
to use it. Works well with bash in gnome-terminal. NO GUARANTEE IT WILL
WORK ON A NON xterm STYLE TERMINAL.
Signed-off-by: Michael Zimmermann <sigmaepsilon92@gmail.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I9189c5f27fed991579edbcbc6834536eb8112152
2014-09-11 19:04:17 -07:00
Paul Lawrence
cf234dc7e0
Preserve errno from fsmgr_do_mount
...
Bug: 17358530
Change-Id: I4cd7403c0b7c4f878d6afa5199f998e6f614adb9
2014-09-11 17:31:49 -07:00
Jeff Brown
c3e6eb21b5
Merge "Move ABI: line below header when dumping stacks." into lmp-dev
2014-09-11 22:30:23 +00:00
Jeff Brown
9b12d53b1a
Move ABI: line below header when dumping stacks.
...
Bug: 17474152
Change-Id: I66b6e7e1cbb004f7a1915a2c1515df6555fe176f
2014-09-11 14:20:04 -07:00
Esteban de la Canal
9dd83dc96e
74602: Fixes adb not seeing connected devices on Mac.
...
Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html
Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602
2014-09-11 11:36:50 -07:00
Jon Eklund
5c9f25da9c
am fcfa8640: audio.h: Add "safe speaker" device for limited-loudness use cases
...
* commit 'fcfa86403e206e2caa519299939480cb45deb8ba':
audio.h: Add "safe speaker" device for limited-loudness use cases
2014-09-11 18:30:51 +00:00
Dan Albert
dccbb07dfb
am a66532e7: am 91baad56: Merge "Fix some clang compilation issues."
...
* commit 'a66532e73a9c8205002482477f1bf53366d15f38':
Fix some clang compilation issues.
2014-09-11 17:48:39 +00:00
Dan Albert
a66532e73a
am 91baad56: Merge "Fix some clang compilation issues."
...
* commit '91baad56f39fb77a4d07a0930c8743ebc61d7c0a':
Fix some clang compilation issues.
2014-09-11 17:31:53 +00:00
Dan Albert
91baad56f3
Merge "Fix some clang compilation issues."
2014-09-11 17:17:56 +00:00
Dan Albert
949aa23898
Fix some clang compilation issues.
...
Use expected inline behavior with clang.
GCC defaults to -std=gnu90, giving C89 inline semantics with GNU
extensions. Clang defaults to C99. Explicitly use gnu90.
Mark an unused parameter as __unused.
Fix some incorrect casts.
Change-Id: I05b95585d5e3688eda71769b63b6b8a9237bcaf4
2014-09-11 17:17:32 +00:00
Jon Eklund
fcfa86403e
audio.h: Add "safe speaker" device for limited-loudness use cases
...
Bug: 17319721
Change-Id: Ie1af5b73258f8a0009c3bc3cecb3e0e8b2262ed7
2014-09-10 15:51:48 -07:00
Elliott Hughes
8fa75e44f1
am 6608a46c: am c4ff0389: Merge "adb: Add USB vendor ID for Alco Digital Devices Limited"
...
* commit '6608a46c59abd72bd42a5104937fb276b6b0ccbd':
adb: Add USB vendor ID for Alco Digital Devices Limited
2014-09-10 18:26:35 +00:00
Elliott Hughes
6608a46c59
am c4ff0389: Merge "adb: Add USB vendor ID for Alco Digital Devices Limited"
...
* commit 'c4ff03899dd6259299c90e9b9e344ec737cd77e4':
adb: Add USB vendor ID for Alco Digital Devices Limited
2014-09-10 18:20:43 +00:00
Elliott Hughes
c4ff03899d
Merge "adb: Add USB vendor ID for Alco Digital Devices Limited"
2014-09-10 18:13:07 +00:00
Chih-Hung Hsieh
aed0769eef
am 04929638: am da3510b2: Merge "Avoid partial initialization warning."
...
* commit '049296382d3604868378c957e999ae63cf3a1f5f':
Avoid partial initialization warning.
2014-09-10 17:21:11 +00:00
Chih-Hung Hsieh
049296382d
am da3510b2: Merge "Avoid partial initialization warning."
...
* commit 'da3510b27246de1ab3eda38a14a80839e2f39c64':
Avoid partial initialization warning.
2014-09-10 17:09:51 +00:00
Chih-Hung Hsieh
da3510b272
Merge "Avoid partial initialization warning."
2014-09-10 16:32:53 +00:00
Andreas Gampe
dc0e2389c5
am 4d1365b4: Merge "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen" into lmp-dev
...
* commit '4d1365b4d3a1b3f904eb5900be8b5269a8807511':
DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen
2014-09-10 07:20:32 +00:00
DanielMo
553630e423
adb: Add USB vendor ID for Alco Digital Devices Limited
...
Change-Id: I50d343d583e688e9f8a72d1c61618b384e310fe1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-09-10 13:58:32 +08:00
Andreas Gampe
4d1365b4d3
Merge "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen" into lmp-dev
2014-09-10 05:09:59 +00:00
Andreas Gampe
f00de413ed
DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen
...
Bug: 17440362
Change-Id: Ifceeecd39d4ffd948f62212ebb5280ebec9bf6ff
2014-09-10 05:09:21 +00:00
Sreeram Ramachandran
18d5aa4d5a
am 69052994: Merge "Support resetting connections tied to any nonexistent address." into lmp-dev
...
* commit '69052994fd21f2b594295f62e2f867e911e8468d':
Support resetting connections tied to any nonexistent address.
2014-09-10 00:51:22 +00:00
Sreeram Ramachandran
69052994fd
Merge "Support resetting connections tied to any nonexistent address." into lmp-dev
2014-09-09 23:24:45 +00:00
Jeff Sharkey
84e533d7b0
am 228f8261: Merge "delete_file() should force removal." into lmp-dev
...
* commit '228f8261fd778e1c03184b5f79f979d1a25abf50':
delete_file() should force removal.
2014-09-09 21:56:14 +00:00
Jeff Sharkey
228f8261fd
Merge "delete_file() should force removal." into lmp-dev
2014-09-09 20:29:57 +00:00
Jeff Sharkey
41b3cfa296
delete_file() should force removal.
...
It's a shell command with a pty, but it's not really interactive,
so force the removal to avoid giving users dead-end prompts.
Bug: 17339227
Change-Id: Iaf5d95c49f032066aa741a711a2c45557d93c598
2014-09-09 12:38:30 -07:00
Sreeram Ramachandran
17622d09d5
Support resetting connections tied to any nonexistent address.
...
Bug: 15414453
Change-Id: Ibf1f052e12b88838a328148e25817a96f10d50f5
2014-09-08 23:35:52 -07:00
Andreas Gampe
eda13fca2e
am 41df668c: NativeBridge: Refactor for new initialization flow
...
* commit '41df668c7be461f461b3d70951dee7634ded868f':
NativeBridge: Refactor for new initialization flow
2014-09-09 05:13:33 +00:00
Andreas Gampe
41df668c7b
NativeBridge: Refactor for new initialization flow
...
Setup becomes Load, have explicit Initialize and Unload.
(cherry picked from commit 035bd7541e
)
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-08 11:12:13 -07:00
Chih-Hung Hsieh
e32b8952a6
Avoid partial initialization warning.
...
Clang compiler is picky about partial initialization and
here we only need to initialize the 'len' field.
BUG: 17410010
Change-Id: I718582cef96d5f4076b5ff1c7b8162327e7809b6
2014-09-08 14:41:28 +00:00
Christopher Ferris
fb849bd46e
am fc8e16bf: am 2c805883: Merge "Add -Wno-deprecated-declarations to makefiles."
...
* commit 'fc8e16bfc59fcebaf554e266aae808eed5f2d078':
Add -Wno-deprecated-declarations to makefiles.
2014-09-06 17:25:48 +00:00
Christopher Ferris
fc8e16bfc5
am 2c805883: Merge "Add -Wno-deprecated-declarations to makefiles."
...
* commit '2c805883408339823d3f3ca23aceb08a1783ebbd':
Add -Wno-deprecated-declarations to makefiles.
2014-09-06 17:02:42 +00:00
Christopher Ferris
2c80588340
Merge "Add -Wno-deprecated-declarations to makefiles."
2014-09-06 16:56:46 +00:00
Chih-Hung Hsieh
6d94763b2f
am 379ca94d: am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST."
...
* commit '379ca94d00cab91a77ad8991cc92e2b4d4236d56':
Include ADB_HOST only code in #if ADB_HOST.
2014-09-05 23:58:09 +00:00
Chih-Hung Hsieh
379ca94d00
am 299a32c8: Merge "Include ADB_HOST only code in #if ADB_HOST."
...
* commit '299a32c8038d4152b302948e5b961f2fcc04f6b2':
Include ADB_HOST only code in #if ADB_HOST.
2014-09-05 23:44:27 +00:00
Chih-Hung Hsieh
299a32c803
Merge "Include ADB_HOST only code in #if ADB_HOST."
2014-09-05 23:38:07 +00:00
Chih-Hung Hsieh
f787b381b6
Include ADB_HOST only code in #if ADB_HOST.
...
BUG: 17409892
Change-Id: Ic1199dd745191aba718fdb18343e87c0ccbe530b
2014-09-05 16:34:02 -07:00