Merge "adb: don\'t try to pull character or block devices." am: 0bb1ce06ea

am: 85a4b33302

* commit '85a4b333020ecf7bf1b5d25cf741ac607ed3d905':
  adb: don't try to pull character or block devices.
This commit is contained in:
Josh Gao 2015-11-10 02:35:19 +00:00 committed by android-build-merger
commit 155d62feb0
1 changed files with 2 additions and 1 deletions

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) {