LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Support lists of files in adb.AndroidDevice.push." am: fccaf17264 am: 0935eedc97 am: d93834bce2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1422601

Change-Id: I922d04dda1fe039b37fa06e3af9a9a0fdf5cd4c2
This commit is contained in:
Treehugger Robot
2020-09-11 06:53:52 +00:00
committed by Automerger Merge Worker
parent 396f7c103c d93834bce2
commit c8b08c8233
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python-packages/adb/device.py
View File

@@ -435,7 +435,13 @@ class AndroidDevice(object):
cmd = ['push'] cmd = ['push']
if sync: if sync:
cmd.append('--sync') cmd.append('--sync')
cmd.extend([local, remote])
if isinstance(local, str):
cmd.extend([local, remote])
else:
cmd.extend(local)
cmd.append(remote)
return self._simple_call(cmd) return self._simple_call(cmd)
def pull(self, remote, local): def pull(self, remote, local):