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.
This commit is contained in:
Josh Gao 2015-11-10 02:32:00 +00:00 committed by android-build-merger
commit 85a4b33302

View file

@ -862,7 +862,8 @@ bool do_sync_pull(const std::vector<const char*>& srcs, const char* dst,
continue;
}
if (S_ISREG(mode) || S_ISLNK(mode) || S_ISCHR(mode) || S_ISBLK(mode)) {
if (S_ISREG(mode) || S_ISLNK(mode)) {
// TODO(b/25601283): symlinks shouldn't be handled as files.
std::string path_holder;
struct stat st;
if (stat(dst_path, &st) == 0) {