Elliott Hughes
07e0ee7cf4
am dcbeb41a: am d558530b: Merge "Fix Windows build."
...
* commit 'dcbeb41a673e3fa6eb8344e9c806cb8a5f7eeff5':
Fix Windows build.
2015-02-05 20:15:04 +00:00
Elliott Hughes
dcbeb41a67
am d558530b: Merge "Fix Windows build."
...
* commit 'd558530ba90cb6218fe8e255c71a034c3fe1ea58':
Fix Windows build.
2015-02-05 18:51:07 +00:00
Paul McLean
9d13e782c6
Merge "Adding name field to AudioPort for enum/select API."
2015-02-05 18:13:48 +00:00
Elliott Hughes
d79801d60d
Fix Windows build.
...
Take 2. Probably should have done this in the beginning, but thought I was
being clever.
Change-Id: I85c6e487eece9bcc75f8f62c850c2d4d1ee9e908
2015-02-05 08:21:37 -08:00
Elliott Hughes
495952fef2
am 44fdd5d1: am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
...
* commit '44fdd5d15a8851e4053af168e7235b30a5f4d34d':
Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:36:47 +00:00
Elliott Hughes
44fdd5d15a
am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
...
* commit '27d28d3baff860d1fd936a5fcf2d920577c52575':
Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:31:31 +00:00
Elliott Hughes
202f024dee
Add a WriteStringToFile overload that cares about permissions.
...
Change-Id: I857a80b61768d4e9610bdd149eff2d9d8e48d2c0
2015-02-04 14:30:23 -08:00
Elliott Hughes
814cb64fb4
am 8a2634c2: am 55732f49: Merge "android_reboot should take a const char*."
...
* commit '8a2634c2ab3914abeb43e0edf46fa69852b6b15d':
android_reboot should take a const char*.
2015-02-04 15:03:49 +00:00
Elliott Hughes
8a2634c2ab
am 55732f49: Merge "android_reboot should take a const char*."
...
* commit '55732f49287a75f9baabe9f150443aec9234c90d':
android_reboot should take a const char*.
2015-02-04 01:20:40 +00:00
Elliott Hughes
0068da6a93
android_reboot should take a const char*.
...
The kernel argument is actually a void*, but it's only read from.
Change-Id: I305c50249bf12b7fbdea4721257aed52a0372f8d
2015-02-03 15:44:16 -08:00
Elliott Hughes
25c2f84c5e
am 14fcc4c6: am e44d25d6: Merge "Add Google-style StringPrintf."
...
* commit '14fcc4c66cbd7e55a12315d985b0723ef4a527ff':
Add Google-style StringPrintf.
2015-02-03 23:41:33 +00:00
Elliott Hughes
14fcc4c66c
am e44d25d6: Merge "Add Google-style StringPrintf."
...
* commit 'e44d25d64537f4ea2abcb56aabc7a5bf0731c222':
Add Google-style StringPrintf.
2015-02-03 23:33:39 +00:00
Elliott Hughes
e44d25d645
Merge "Add Google-style StringPrintf."
2015-02-03 23:23:11 +00:00
Elliott Hughes
6b3be2902d
Add Google-style StringPrintf.
...
Change-Id: If333c28b8ed047346a2dd85e591c4bedbab874cc
2015-02-03 15:21:07 -08:00
Elliott Hughes
e17fc7cf3c
am c3bf8d85: am 9fc43358: Merge "Extra Win32 compatibility."
...
* commit 'c3bf8d85b58c4a4711983adcd6321a580d6835b1':
Extra Win32 compatibility.
2015-02-03 22:56:42 +00:00
Elliott Hughes
c3bf8d85b5
am 9fc43358: Merge "Extra Win32 compatibility."
...
* commit '9fc43358f72a581beb26532ea2cb1f2adc053758':
Extra Win32 compatibility.
2015-02-03 22:36:57 +00:00
Elliott Hughes
714196d05c
Extra Win32 compatibility.
...
Change-Id: Ibc583aba580f4fc15c243f495ead44b2ce4c6e5e
2015-02-03 14:26:58 -08:00
Elliott Hughes
a803b7697f
am 813d0ac1: am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
...
* commit '813d0ac13614b6199f407762f679afc9f439be7e':
Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:39:30 +00:00
Elliott Hughes
813d0ac136
am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
...
* commit '6974ba4ed430ec3247c3a5c04a2263b4b04ff827':
Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:33:00 +00:00
Elliott Hughes
dec12b2b71
Add Google-style ReadFileToString and WriteStringToFile.
...
Bug: 19217569
Change-Id: I64789d3fa6777ee30a324cdf00fdc275c1230e1b
2015-02-03 12:18:11 -08:00
Elliott Hughes
d3e3bfd6c0
am dbf6f33e: am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
...
* commit 'dbf6f33e84a4de9944b782ec079ba8b51f3e9c25':
Revert "Remove netcfg's unused options."
2015-02-03 20:15:17 +00:00
Elliott Hughes
dbf6f33e84
am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
...
* commit '2b2b7632f55ca73562361cf4d06e60e7b62f7ff4':
Revert "Remove netcfg's unused options."
2015-02-03 20:09:30 +00:00
Elliott Hughes
c463025a19
Revert "Remove netcfg's unused options."
...
This reverts commit f8e83054cb
.
Change-Id: Iede772f96ff9008277df433dcbb5f6603de65283
2015-02-03 19:56:35 +00:00
Elliott Hughes
d58fe3880e
am b862d3e8: am 6a728fde: Merge "Remove netcfg\'s unused options."
...
* commit 'b862d3e8eb92323983020830f3d39240d6cfbee3':
Remove netcfg's unused options.
2015-02-03 19:18:43 +00:00
Elliott Hughes
d4e71f154e
am 5b253e55: am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
...
* commit '5b253e55e0ac4d6b935036c1e8aa5151caf09ccc':
Revert "Remove netcfg's unused options."
2015-02-03 19:18:42 +00:00
Elliott Hughes
85ed30d881
am 1ddbd76b: am 67900498: Merge "Remove netcfg\'s unused options."
...
* commit '1ddbd76bd8eededb5d854dc588d3cef68cdc0c69':
Remove netcfg's unused options.
2015-02-03 19:18:41 +00:00
Elliott Hughes
b862d3e8eb
am 6a728fde: Merge "Remove netcfg\'s unused options."
...
* commit '6a728fde77d1367318c79e5b182f0cb316872a37':
Remove netcfg's unused options.
2015-02-03 19:16:42 +00:00
Elliott Hughes
5b253e55e0
am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
...
* commit 'ef89e8d14619c68015103fd51ff75f82eeef8d61':
Revert "Remove netcfg's unused options."
2015-02-03 19:16:42 +00:00
Elliott Hughes
1ddbd76bd8
am 67900498: Merge "Remove netcfg\'s unused options."
...
* commit '67900498cff54c8116b3f7afc84e046d98bb17e4':
Remove netcfg's unused options.
2015-02-03 19:12:53 +00:00
Elliott Hughes
f8e83054cb
Remove netcfg's unused options.
...
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.
Change-Id: Iaf499c06b09ffe5e0925339b9cd6e502f3234a86
2015-02-03 11:08:07 -08:00
Elliott Hughes
ca77255c26
Revert "Remove netcfg's unused options."
...
This reverts commit 24c1885bc1
.
Change-Id: Iaae6502e2db90d67b4275faa104cfc6a0abc65c6
2015-02-03 19:07:43 +00:00
Elliott Hughes
24c1885bc1
Remove netcfg's unused options.
...
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.
Change-Id: Ie0aecf5b18bd854cfb5878b6cfdd7160c9f42526
2015-02-02 14:39:42 -08:00
Paul McLean
9bc8190442
Adding name field to AudioPort for enum/select API.
...
Change-Id: I9e7a6476f7f2658c6ea1ac255683fefb9f598a2d
2015-02-02 12:45:38 -08:00
Dmitriy Ivanov
6458c0dc0a
am bbbe9885: am 7cb19579: Merge "Add close_file flag to OpenArchiveFd()"
...
* commit 'bbbe988539a525e56809cc542876f63aef89fbac':
Add close_file flag to OpenArchiveFd()
2015-02-02 19:32:02 +00:00
Dmitriy Ivanov
bbbe988539
am 7cb19579: Merge "Add close_file flag to OpenArchiveFd()"
...
* commit '7cb19579bc22bf38e15b970f801f8065d629611d':
Add close_file flag to OpenArchiveFd()
2015-02-02 19:14:17 +00:00
Dmitriy Ivanov
40b52b2c88
Add close_file flag to OpenArchiveFd()
...
* We should be able to keep fd alive after CloseArchive()
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-01-30 17:57:13 -08:00
Yabin Cui
3f83554d22
am 631965a3: am e862350b: Merge "Kill HAVE_PTHREADS."
...
* commit '631965a32eb503dc6782a298eb534881aa3697b8':
Kill HAVE_PTHREADS.
2015-01-28 00:42:36 +00:00
Yabin Cui
631965a32e
am e862350b: Merge "Kill HAVE_PTHREADS."
...
* commit 'e862350bb2eb3d3eda526da7f3b6d5c2dd40a445':
Kill HAVE_PTHREADS.
2015-01-27 22:45:14 +00:00
Yabin Cui
4a6e5a3b64
Kill HAVE_PTHREADS.
...
Bug: 19083585
Change-Id: Ic09eb3dd250bc5c5b63cac7998f99f5fa007f407
2015-01-27 14:23:22 -08:00
Mark Salyzyn
66d51342c8
am 982421df: am 91581f19: Merge "liblog: add pstore write"
...
* commit '982421df4584f5691b33444ae3e18b81d6544b6a':
liblog: add pstore write
2015-01-24 16:57:50 +00:00
Mark Salyzyn
cd7ef90e62
am f0cc42f5: am 4730328d: Merge "logd: create private/android_logger.h"
...
* commit 'f0cc42f525c237431aa560ff42a3e8548bfbd3f4':
logd: create private/android_logger.h
2015-01-24 16:57:48 +00:00
Mark Salyzyn
982421df45
am 91581f19: Merge "liblog: add pstore write"
...
* commit '91581f19906ade01eabc6e10a7dac209e710117a':
liblog: add pstore write
2015-01-23 23:59:45 +00:00
Mark Salyzyn
f0cc42f525
am 4730328d: Merge "logd: create private/android_logger.h"
...
* commit '4730328da72ef9b7aeaefc120358155fdfd8dde8':
logd: create private/android_logger.h
2015-01-23 23:59:43 +00:00
Zhijun He
7be3af0a7a
Merge "camera: add external camera facing enum"
2015-01-23 23:57:59 +00:00
Mark Salyzyn
d91ab5815d
liblog: add pstore write
...
Used to push the Android log messages into pstore
(when available, and no propagation of error).
Change-Id: I9def8cf796d35d347f502d9745d5f42ec1200253
2015-01-23 23:33:31 +00:00
Mark Salyzyn
b5f6e45d6b
logd: create private/android_logger.h
...
- create a structure to depict the private header
expected at logd end of socket.
- utilize this new structure instead of unscalable
byte stream technique used to unpack in logd.
Change-Id: I2d0e5c3531c279f2dc1fbd74807210ff8d804de0
2015-01-23 23:32:11 +00:00
Zhijun He
46e0a589d5
camera: add external camera facing enum
...
This is to enable the external camera support.
Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
2015-01-22 13:43:09 -08:00
Christopher Ferris
bd3bbff674
am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."
...
* commit 'd426a4e7b62c18124827868ddbf8987aa433451b':
Move 32 bit/64 bit check into debuggerd.
2015-01-22 00:13:01 +00:00
Christopher Ferris
9774df6134
Move 32 bit/64 bit check into debuggerd.
...
On 64 bit systems, calls to dump_backtrace_to_file or dump_tombstone
try and directly contact the correct debuggerd (32 bit vs 64 bit)
by reading the elf information for the executable.
Unfortunately, system_server makes a call to dump_backtrace_to_file
and it doesn't have permissions to read the executable data, so it
defaults to always contacting the 64 bit debuggerd.
This CL changes the code so that all dump requests go to the 64 bit
debuggerd, which reads the elf information and redirects requests for
32 bit processes to the 32 bit debuggerd.
Testing:
- Forced the watchdog code in system_server to dump stacks and
verified that all native stacks are dumped correctly.
- Verified that dumpstate and bugreport still properly dump the native
processes on a 64 bit and 32 bit system.
- Intentionally forced the 64 bit to 32 bit redirect to write only a
byte at a time and verified there are no errors, and no dropped data.
- Used debuggerd and debuggerd64 to dump 32 bit and 64 bit processes
seemlessly.
- Used debuggerd on a 32 bit system to dump native stacks.
Bug: https://code.google.com/p/android/issues/detail?id=97024
Change-Id: Ie01945153bdc1c4ded696c7334b61d58575314d1
2015-01-20 17:22:07 -08:00
Elliott Hughes
bb604524fb
am 45c4c06f: Merge "Remove unused cruft from libcutils."
...
* commit '45c4c06ffe6f38e0f77f37f488e07f2537eddd45':
Remove unused cruft from libcutils.
2015-01-16 16:02:24 +00:00