summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-11-21 00:43:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-21 00:43:51 +0000
commit377d6f00dc2ab42df501fd12b23e1dab54cea6b7 (patch)
tree68ca3dd6db17c060f07f573362c1a9d66019bfc5 /cmds
parent0d4a4e6e59267ed58d9fe44303e400877aa1caab (diff)
parent42fec57f3addfb1958f814b5d6772ff81341ba20 (diff)
downloadframeworks_base-377d6f00dc2ab42df501fd12b23e1dab54cea6b7.zip
frameworks_base-377d6f00dc2ab42df501fd12b23e1dab54cea6b7.tar.gz
frameworks_base-377d6f00dc2ab42df501fd12b23e1dab54cea6b7.tar.bz2
am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev
* commit '42fec57f3addfb1958f814b5d6772ff81341ba20': Fix issue with call backs from media process.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/content/src/com/android/commands/content/Content.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/content/src/com/android/commands/content/Content.java b/cmds/content/src/com/android/commands/content/Content.java
index 948c9a2..bd34a9c 100644
--- a/cmds/content/src/com/android/commands/content/Content.java
+++ b/cmds/content/src/com/android/commands/content/Content.java
@@ -501,7 +501,7 @@ public class Content {
@Override
public void onExecute(IContentProvider provider) throws Exception {
- final ParcelFileDescriptor fd = provider.openFile(null, mUri, "r", null);
+ final ParcelFileDescriptor fd = provider.openFile(null, mUri, "r", null, null);
copy(new FileInputStream(fd.getFileDescriptor()), System.out);
}