summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | rootdir: add permission for /dev/dvb*Terry Heo2015-05-071-0/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20112245 Change-Id: I513c6ed5b65d5bd4edef6cb12d7fc20eb9cad4f1
* | | | | | | | | | | | | | Merge changes Ie9d9a7ad,If7479bdc into mnc-devElliott Hughes2015-05-135-11/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix insmod module size Enable property expansion for insmod
| * | | | | | | | | | | | | | Fix insmod module sizeTom Cherry2015-05-125-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_file() used to append a new line character to the end of the buffer it returns, because parse_config() isn't able to cope with input that's not '\n'-terminated. Fix read_file() to be less insane, and push the workarounds into the parse_config() callers. Longer term we should rewrite parse_config(). Bug: http://b/21079470 Change-Id: Ie9d9a7adcd33b66621726aef20c4b8cc51c08be7 (cherry picked from commit eaa3b4ec6f79fe06163b8dd6fe8ba2581d3b9c0b)
| * | | | | | | | | | | | | | Enable property expansion for insmodEmmanuel Berthier2015-05-121-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for dynamic kernel module location. This permits to use init rule like: insmod ${persist.modules.location}/<module_name> Change-Id: If7479bdcb4e69ea7666f52a0075c785be025c2e9 Signed-off-by: Emmanuel Berthier <emmanuel.berthier@intel.com> (cherry picked from commit ac41230cbc10bae95a049282238adb03605579c2)
* | | | | | | | | | | | | | | logd: Add Tag statisticsMark Salyzyn2015-05-125-2/+110
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 344bff4391dd434dda501e812f18f524290c5a7c) - Optional class of statistics for events Tags - export tagToName from LogBuffer (located in main.cp to address https://android-review.googlesource.com/#/c/110204) - Can not handle dropped because getTag() can not work, will need to be fixed if we start filtering. Bug: 19608965 Change-Id: I7b90607ca588bf37bab71f19b1570a290e772776
* | | | | | | | | | | | | | logd: pidToName deficiencyMark Salyzyn2015-05-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cherry pick from commit aa43ae2268076227e8b72ea095f8aeac439b3168) any logging in zygote permanently sets the pidToName Change-Id: I0b8fdc96fb5965a04d4dc4293c39815beef5eb8e
* | | | | | | | | | | | | | logd: uidToName add dex2oat UIDMark Salyzyn2015-05-121-2/+7
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry pick from commit 023f51f360472f6bb9bad495e55cdb32b5411bc5) - When searching for uidToName from /data/system/packages.list one must search for the uid % AID_USER; - If uid % AID_USER is greater than AID_SHARED_GID_START - AID_APP, then subract it and try again to pick up uidToName. Change-Id: I24df42957ff7e746fffa5d39484637b1b726b9c0
* | | | | | | | | | | | | Revert "libaudit: limit to 5 selinux denials per sec"Nick Kralevich2015-05-111-1/+1
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shamu instabilities continued even after throttling SELinux denials to 5/second. 5 denials per second is too low when doing device bringup, and there have been some complaints about lost SELinux denials. See, for example, http://comments.gmane.org/gmane.comp.security.selinux/21941 Bring the limit back up to 20/second to prevent dropping too many denials on the floor. This reverts commit a15db51bbf961ff711d71c10d20e18ad2bfaef45. (cherrypick of commit 9667a66019388fb09430d3f8896ccc531eb24ef5) Change-Id: I05e85cce0a792d05aa557fcc614c0fc019c15014
* | | | | | | | | | | | Failure to find an oem partition should not be a remount failure.Elliott Hughes2015-05-113-31/+20
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many devices don't have an /oem partition, so find_mount should be expected to fail, but shouldn't cause the overall remount to fail. Also clean up all the error handling and reporting, and remove the dead int* globals. Bug: http://b/21024141 Change-Id: Ie31021b03c9cab8e972269d7d1ffe383cd30ee9e (cherry picked from commit 9aa4fda4e64c1882faf019cc2a483ee4917e0c85)
* | | | | | | | | | | Merge "load ro.recovery_id property from recovery partition" into mnc-devAndres Morales2015-05-094-1/+65
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | load ro.recovery_id property from recovery partitionAndres Morales2015-05-084-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9dc1f325e353375d9c1c8ed949636e2404601076
* | | | | | | | | | | | Switch liblog.so to hash-style=bothDmitriy Ivanov2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/19059885 Change-Id: I7cde911f11b09c3a13553154aca6e291bb91befb (cherry picked from commit fd8afe6f31c4dd290d8bc68ce9848d73879f4f8a)
* | | | | | | | | | | | Fix "adb remount" for devices without an oem partition.Elliott Hughes2015-05-082-53/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a device without an oem partition, we now have an /oem directory anyway. This causes find_mount to fail, and that was returning nullptr from a std::string-returning function. Boom! Also clean up the bits of code I had to trace through between "adb remount" on the host to the crash on the device as I debugged this. The only other meaningful change is the error checking in adb_connect_command --- adb_connect can also return -2. Bug: http://b/20916855 Change-Id: I4c3b7858e13f3a3a8bbc7d30b3c0ee470bead587 (cherry picked from commit 5677c23e8d0c085be8d8429a5d125147d11e9bb2)
* | | | | | | | | | | | Merge "Be tolerant of devices that don't report serials." into mnc-devBenson Leung2015-05-082-28/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Be tolerant of devices that don't report serials.Dan Albert2015-05-072-28/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The USB spec explicitly says this is optional, so we shouldn't be relying on it. Bug: http://b/20883914 Change-Id: Icf38405b00275199bcf51a70c47d428ae7264f2b
* | | | | | | | | | | | | Try to include the SHA in a ddmslib-compatible way.Elliott Hughes2015-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/20918202 Change-Id: I0c1a48459372b0d28aaf9d09d82540e44b438c9c (cherry picked from commit f3bbfa6a216669c4cd91d5f936662e89e0ae07ca)
* | | | | | | | | | | | | Merge changes Iac33dbaa,I18fcd37d into mnc-devAndres Morales2015-05-082-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: pass in correct buffer to print_id stop including rootdir build.prop
| * | | | | | | | | | | | pass in correct buffer to print_idAndres Morales2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hdr.id is actually larger than sha Change-Id: Iac33dbaaf4bea9acde5ba49d8601f7ac767677d5
| * | | | | | | | | | | | stop including rootdir build.propAndres Morales2015-05-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merged with default.prop Change-Id: I18fcd37ddc63e3607278d0741181d0779118132d
* | | | | | | | | | | | | Merge "mkbootimg: make mkbootimg print image cksum to stdout" into mnc-devAndres Morales2015-05-081-34/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | / / / / / / / / / / / | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | mkbootimg: make mkbootimg print image cksum to stdoutAndres Morales2015-05-071-34/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used by the build system as a fingerprint for the image Change-Id: Ifaf230b881e68d921a8158ed2e8a3ee41f27a4b3
* | | | | | | | | | | | mkbootimg: use fixed-size types for image formatRom Lemarchand2015-05-072-28/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I471ef420c3944b3ffefdba9ca7122c6a7f09e5ac
* | | | | | | | | | | | am 6269a95a: resolved conflicts for merge of b67b92f2 to lmp-mr1-ub-devChristopher Ferris2015-05-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6269a95a8fe74193d25039cda45b42bfac243586': Do not dump maps/memory/code of sibling threads. DO NOT MERGE
| * | | | | | | | | | | resolved conflicts for merge of b67b92f2 to lmp-mr1-ub-devChristopher Ferris2015-05-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: I6aa2ee2c4bf1802e5aa814374f9842a34179ffea
| | * | | | | | | | | | Do not dump maps/memory/code of sibling threads. DO NOT MERGEChristopher Ferris2015-05-071-43/+39
| | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies the code so that if the unwind fails, the code still prints as much data as possible. Also, for sibling threads, skip printing the maps and memory/code since it's not likely to be very relevant. Fix a few cases where extra space is at the end of lines. Fix an inverted if statement that was checking the wrong condition. Bug: 18816322 Bug: 20829534 (cherry picked from ab9e7dcef62ae05b3c74215325a2bd2b554d383a) Change-Id: If2d3a734724c23df4192f4dfc6bd69d6729fbc8d
* | | | | | | | | | | logd: class hierarcy for Uid and Pid statistics.Mark Salyzyn2015-05-073-137/+126
| |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cherry pick from commit 81b3eabc49736b89c4f99940f79785074955eaa5) Add EntryBase and EntryBaseDropped base classes for statistical entries to inherit from. Abstract add(), subtract() and drop() methods to common LogBufferElement in each for entry policy decisions. Some move of details out of LogStatistics.cpp and place them into LogStatistics.h. Add statistical add(), subtract() and drop() methods to hash table to call entries for policy. Bug: 19608965 Change-Id: Ib8a33a8fe28871ef165d1632c6546a5c606231e8
* | | | | | | | | | Fix small ptrace reads.Christopher Ferris2015-05-062-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BacktracePtrace::Read function crashes if the number of bytes to read is less than the number of bytes needed to align the read to a word_t boundary. Fix this and add a test for this case. Change-Id: I50808849ece44928f65dba1d25309e3885c829a2 (cherry picked from commit 944f417ccb86441060ffb670b4bdc2975fda08fc)
* | | | | | | | | | Add offset to map data.Christopher Ferris2015-05-063-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, print the offset in the maps section. Bug: 20864928 Change-Id: I71f005726e5ef73cf75bbcb8f829fd5127cb9d61 (cherry picked from commit 5c8856854de4ae7836fc1073d534f4b7b7a03eb9)
* | | | | | | | | | Add /data/misc/perfprofd to store perf profile.Dehao Chen2015-05-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 19483574 (cherry picked from commit 30c401fa92f5a32a9a41024d9d1daddd1bc37ea5) Change-Id: Ibf96db9f7e5db625b395db20b73572acc240b1f9
* | | | | | | | | | rootdir: make sure the /oem mountpoint is always availableNick Kralevich2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The /oem mount point is used to mount semi-trusted data, and many Android One devices depend on it. Make sure it's guaranteed to always be available. (cherrypicked from commit f3b554fc614fffaa5fc62ef1b4147131a8fa373c) Bug: 20816563 Change-Id: Ib5272f025d14d4da6125d753879054b3faeae696
* | | | | | | | | | Include the git sha in the adb version.Dan Albert2015-05-063-21/+34
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add --version to adbd to display the same thing. Change-Id: I47dfbad16c892c42ea938aedd085ba77492791ba (cherry picked from commit 1ba1d7c1ee644967ff4743b0d257290cbeca7a83)
* | | | | | | | | All debuggerd log output marked fatal.Christopher Ferris2015-05-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the log daemon skipping some of the log output from debuggerd. Bug: 20846525 (cherry picked from commit b0412a5c2b446edb137980333aa0a0bbfda2e955) Change-Id: Ifed48814d76c7e855645b6d5487d5e6e1fcafd9e
* | | | | | | | | Implement the ssh(1) escaping rules.Elliott Hughes2015-05-052-70/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first rule of ssh(1) escaping is that there is no escaping. This doesn't undo any of my recent security fixes because they're all calling escape_arg themselves. This fixes "adb shell rm /data/dalvik-cache/arm/*". Also remove do_cmd which caused concern during code review. Bug: http://b/20564385 Change-Id: I4588fd949d51e2a50cff47ea171ed2d75f402d0d (cherry picked from commit 2b10111d25adcfe3627103b73edad22f188c97ba)
* | | | | | | | | Invoke perfprofd daemon (only for userdebug/eng builds).Than McIntosh2015-05-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifaabe32dda6db249efc62c5db3760e32295eb1a9 (cherry picked from commit d6544d2a405df4c6e1fb517b1038a3640ae5f095)
* | | | | | | | | Add WriteFdFmt and clean up more code.Elliott Hughes2015-05-0114-158/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also say *which* device wasn't found. Bug: http://b/20666660 Change-Id: I50e234ad89e39ae0a8995083c0b642c61275c5a3 (cherry picked from commit ab52c181fa4c1c9891644635dc5653cda5b90e2b)
* | | | | | | | | More adb buffer fixes.Elliott Hughes2015-05-0122-599/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch factors out a lot of the basic protocol code: sending OKAY, sending FAIL, and sending a length-prefixed string. ADB_TRACE has been non-optional for a long time, so let's just remove the #ifs. Also actually build the device tracker test tool (and remove its duplicate). Bug: http://b/20666660 Change-Id: I6c7d59f18707bdc62ca69dea45547617f9f31fc6 (cherry picked from commit e67f1f87d9b1188ec8617035db7006c37ee7b21e)
* | | | | | | | | Merge "Add load base to map for relocation packing." into mnc-devChristopher Ferris2015-05-025-6/+26
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add load base to map for relocation packing.Christopher Ferris2015-05-015-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new linker relocation packing support uses non-zero load bases, so we better handle them properly. Also print out the load base for a map if it's non-zero. Bug: 20687795 Change-Id: Iec2d1db2051e7b4a278c1dfa57d745128a7f2974
* | | | | | | | | logd: improve details on chatty recordsMark Salyzyn2015-04-306-22/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cherry pick from commit 21fb7e0b753b2251369bfaa1c6f6a09e58e64437) - Report applications UID, TID/PID by name. - change wording to have an accurate connotation - drop privilege check since filtered upstream Bug: 19608965 Bug: 20334069 Bug: 20370119 Change-Id: I2b1c26580b4c2de293874214ff5ae745546f3cca
* | | | | | | | | logd: reduce chance of dropped 1 messagesMark Salyzyn2015-04-301-1/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not time out at 1 second if drop has count of less than 4 (Cherry picked from commit 35173a9ac5bd1f4702ccfda3df02ec47ecb57949) Bug: 20334069 Bug: 20370119 Change-Id: I787cb553dfab5ed71abd6ed72b63de675f834e0c
* | | | | | | | More fixed-length buffer removal.Elliott Hughes2015-04-306-272/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/20666660 Change-Id: I0c738e9fed2defed48a9cf2d0a4f7b99c08dcf3d (cherry picked from commit 6452a89aa8934231e12ab77e0d90f12c3e892ad1)
* | | | | | | | Add missing 'else' to fix all devices showing up as "host".Elliott Hughes2015-04-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/20705355 Change-Id: I4f7830278f0c2bc87d95d148d85455b8da894645 (cherry picked from commit 3ce9575af76fa6dc110506080434303b9459abf4)
* | | | | | | | Merge "libusbhost: Add usb_device_get_version()" into mnc-devMike Lockwood2015-04-292-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | libusbhost: Add usb_device_get_version()Mike Lockwood2015-04-292-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2161178e9fe94a94faf01c102ef64f2a72d093b
* | | | | | | | | Fix Win32 build.Elliott Hughes2015-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry-pick of 1b600a902cc0b3a6065c962293292a5ac689fafe.) Change-Id: Icf2c8df99b4b88bbf85a4097731733c5795fba44
* | | | | | | | | Move __adb_error to std::string, and improve various errors.Elliott Hughes2015-04-294-179/+185
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove an sprintf. Also fix various bits of code that were reporting stale adb_error values when they meant strerror. (cherry-pick of 078f0fcf4c63b8d8e8c10a18855eae04ca321e06.) Bug: http://b/20666660 Change-Id: Ibeb48b7bc21bb0ec30ba47889d1d671ee480e1b7
* | | | | | | | Merge "Add float support to binary event log." into mnc-devJeff Brown2015-04-293-3/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Add float support to binary event log.Jeff Brown2015-04-283-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20664753 Change-Id: Ib4752bd785496dab5bb4d4979d5d80f662adbdfa
* | | | | | | | | ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE queryDan Stoza2015-04-281-1/+10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a NATIVE_WINDOW_BUFFER_AGE query, which returns the age of the contents of the most recently dequeued buffer as the number of frames that have elapsed since it was last queued. Change-Id: Ib6fd62945cb62d1e60133a65beee510363218a23 (cherry picked from commit 19df32cd19b7fd940eef01b9c92a485144263495)
* | | | | | | | Remove strtok from adb.Elliott Hughes2015-04-287-206/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix android::base::Split to behave like Java, Python, and google3. (cherry picked from commit 8d5fa6da44d56511b3e173bc463cbc65ff221b4a) Change-Id: I9388ae37ee8dd4a4a6c2a9a19f068b70d9a78353