summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Support the full length of USB serial numbers.Elliott Hughes2015-04-273-89/+45
| | | | | | | | | | | | Two bugs: we couldn't report the serial number correctly if it was long enough, and it wasn't possible to connect to a device whose serial number was long enough to overflow a different fixed-length buffer. Bug: http://b/20317730 (cherry picked from commit 9309ecbcec428edfcb487ef697862bce59a1aed5) Change-Id: I04c160a215418a57bd4fb27b7f63060c8be6f12e
* Use WriteFully in debuggerd to talk to ActivityManager.Elliott Hughes2015-04-271-16/+3
| | | | | | (cherry picked from commit b7cd09b93eaa8efa42db880a419d8d845dd4b4b3) Change-Id: Ic81b4134fe563d8ebb15ba4ff3e9b2e8893c97a5
* am ada332e4: am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining ↵Nick Kralevich2015-04-263-43/+48
|\ | | | | | | | | | | | | double mounts" * commit 'ada332e4a01a3bb290be26f8a5b67993bd10af14': init: get rid of the remaining double mounts
| * am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts"Nick Kralevich2015-04-263-43/+48
| |\ | | | | | | | | | | | | * commit 'ecf184c901b78994773d687763c1478752e9375e': init: get rid of the remaining double mounts
| | * am 9c9280d8: Merge "init: get rid of the remaining double mounts"Nick Kralevich2015-04-263-43/+48
| | |\ | | | | | | | | | | | | | | | | * commit '9c9280d863d7377858af6e1543ea4ada7af3b0ec': init: get rid of the remaining double mounts
| | | * Merge "init: get rid of the remaining double mounts"Nick Kralevich2015-04-263-43/+48
| | | |\
| | | | * init: get rid of the remaining double mountsNick Kralevich2015-04-253-43/+48
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't double mount /dev and its subdirectories anymore. Instead, the first stage init is solely responsible for mounting it. Don't have init prepare the property space. This is the responsibility of the second stage init. Don't have SELinux use the property space to determine how we should be running. Instead, create a new function and extract the data we need directly from /proc/cmdline. SELinux needs this information in the first stage init process where the property service isn't available. Change-Id: I5b4f3bec79463a7381a68f30bdda78b5cc122a96
* | | | am ec9bd166: am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if ↵Nick Kralevich2015-04-261-14/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | available" * commit 'ec9bd166cc406d8079b7d33d04b3e04708183d96': init: use SELinux /dev/null if available
| * | | am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available"Nick Kralevich2015-04-261-14/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '45a49d0eb7e2e9fc3d2c48884c84f6a6c7397720': init: use SELinux /dev/null if available
| | * | am ccac2be8: Merge "init: use SELinux /dev/null if available"Nick Kralevich2015-04-261-14/+19
| | |\ \ | | | |/ | | | | | | | | | | | | * commit 'ccac2be8a6269469087a7978e1a6db62ef4618c6': init: use SELinux /dev/null if available
| | | * Merge "init: use SELinux /dev/null if available"Nick Kralevich2015-04-261-14/+19
| | | |\
| | | | * init: use SELinux /dev/null if availableNick Kralevich2015-04-251-14/+19
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SELinux provides it's own /dev/null character device at /sys/fs/selinux/null. This character device is exactly the same as /dev/null, including the same major/minor numbers, and can be used wherever /dev/null is used. Use /sys/fs/selinux/null instead of trying to create our own /dev/__null__ device. This moves us one step closer to eliminating all uses of mknod() by init. /sys/fs/selinux/null is only available once the /sys/fs/selinux filesystem is mounted. It's not available to the first stage init, so we still have to fall back to mknod then. Change-Id: Ic733767ea6220a130537de33cc478ae79578ce20
* | | | am 1c2457ff: am b31c3a5a: am 178299fd: Merge "init: don\'t double mount ↵Nick Kralevich2015-04-251-3/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | /proc and /sys" * commit '1c2457ffdaf833b06a2619d967fe9def7139180f': init: don't double mount /proc and /sys
| * | | am b31c3a5a: am 178299fd: Merge "init: don\'t double mount /proc and /sys"Nick Kralevich2015-04-251-3/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'b31c3a5a453cd9f472698068af9909e80a96ab2c': init: don't double mount /proc and /sys
| | * | am 178299fd: Merge "init: don\'t double mount /proc and /sys"Nick Kralevich2015-04-251-3/+8
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '178299fd459b7622e9e3de05a48d6ba050f92bec': init: don't double mount /proc and /sys
| | | * Merge "init: don't double mount /proc and /sys"Nick Kralevich2015-04-251-3/+8
| | | |\
| | | | * init: don't double mount /proc and /sysNick Kralevich2015-04-251-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first stage init mounts /proc and /sys, and then the second stage init also mounts /proc and /sys on top of the existing mount. Only mount these two directories once, in the first stage init. Not yet fixed: the double mounting of /dev. Removing the double mounting doesn't work right now because both init stages are trying to create a property space, and if the double mount of /dev goes away, the property service in the second stage init fails to work. Change-Id: I13719027a47526d074390c2b1a605ad99fb43a8f
* | | | | am 2ae7d4ee: am 6b6df173: am f8b0743e: Merge "init: fix write_file ↵Nick Kralevich2015-04-252-8/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | checkreqprot logic error" * commit '2ae7d4eefddf2cd7ac4bba60fb6d057e2b01731b': init: fix write_file checkreqprot logic error
| * | | | am 6b6df173: am f8b0743e: Merge "init: fix write_file checkreqprot logic error"Nick Kralevich2015-04-252-8/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '6b6df1733711ace006e0f4f9d44c718f85d2f70d': init: fix write_file checkreqprot logic error
| | * | | am f8b0743e: Merge "init: fix write_file checkreqprot logic error"Nick Kralevich2015-04-252-8/+10
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'f8b0743ef418c15fe622143a6b4b42b102a07803': init: fix write_file checkreqprot logic error
| | | * | Merge "init: fix write_file checkreqprot logic error"Nick Kralevich2015-04-252-8/+10
| | | |\ \
| | | | * | init: fix write_file checkreqprot logic errorNick Kralevich2015-04-252-8/+10
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_file() returned -errno on error, not -1. Callers who check for -1 would falsely believe that the write was successful when it wasn't. Fixup write_file so that it return -1 on error consistent with other functions. Change-Id: Ic51aaf8678d8d97b2606bd171f11b3b11f642e39
* | | | | am 4f790e37: am ecd6e36d: am 47a9ef2f: Merge "Improve logging of ↵Elliott Hughes2015-04-251-24/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | USBDEVFS_CLAIMINTERFACE failures." * commit '4f790e37142f2bda0f59bdf84060324bc51756fd': Improve logging of USBDEVFS_CLAIMINTERFACE failures.
| * | | | am ecd6e36d: am 47a9ef2f: Merge "Improve logging of USBDEVFS_CLAIMINTERFACE ↵Elliott Hughes2015-04-251-24/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | failures." * commit 'ecd6e36d37d2e1fcc021762baaff417c94920dd4': Improve logging of USBDEVFS_CLAIMINTERFACE failures.
| | * | | am 47a9ef2f: Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures."Elliott Hughes2015-04-251-24/+20
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '47a9ef2f116fd885a3ba0e9027a45b2a68cc5b3f': Improve logging of USBDEVFS_CLAIMINTERFACE failures.
| | | * | Merge "Improve logging of USBDEVFS_CLAIMINTERFACE failures."Elliott Hughes2015-04-251-24/+20
| | | |\ \ | | | | |/ | | | |/|
| | | | * Improve logging of USBDEVFS_CLAIMINTERFACE failures.Elliott Hughes2015-04-251-24/+20
| | | |/ | | | | | | | | | | | | | | | | Bug: https://code.google.com/p/android/issues/detail?id=170054 Change-Id: I9b11eb019093e3322da0a8e70d6e17de4c25ab75
* | | | am 04faed7a: am ecfb3664: am 8929c77a: Merge "init: remove mkdir /dev /proc ↵Nick Kralevich2015-04-251-4/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | /sys" * commit '04faed7aba1ff66ea62c041424ce572400494cbb': init: remove mkdir /dev /proc /sys
| * | | am ecfb3664: am 8929c77a: Merge "init: remove mkdir /dev /proc /sys"Nick Kralevich2015-04-251-4/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ecfb3664fea6cbe39d94459ceb06a91f57006820': init: remove mkdir /dev /proc /sys
| | * | am 8929c77a: Merge "init: remove mkdir /dev /proc /sys"Nick Kralevich2015-04-251-4/+0
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '8929c77ab9aa9be612291809669e9162837c54ae': init: remove mkdir /dev /proc /sys
| | | * Merge "init: remove mkdir /dev /proc /sys"Nick Kralevich2015-04-251-4/+0
| | | |\
| | | | * init: remove mkdir /dev /proc /sysNick Kralevich2015-04-251-4/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | These directories are already present in the initial ramdisk, and these mkdir calls are no-ops. Change-Id: I528f9e96a3471de904845a2f9e09c1b6ff83a708