diff options
author | Elliott Hughes <enh@google.com> | 2013-07-09 15:24:13 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2013-07-09 15:25:23 -0700 |
commit | e16a21c6b4f108813e5f5e00f30e0ff075de504c (patch) | |
tree | 97f03d1ca4030d0925ba82fd41398cf428aef0f8 /packages/DefaultContainerService/src | |
parent | fb231fea6cd4dac7323b1df74006b294c3c9bfef (diff) | |
parent | 4a59376d5ee031e930e61292ed9e92e96e956724 (diff) | |
download | frameworks_base-e16a21c6b4f108813e5f5e00f30e0ff075de504c.zip frameworks_base-e16a21c6b4f108813e5f5e00f30e0ff075de504c.tar.gz frameworks_base-e16a21c6b4f108813e5f5e00f30e0ff075de504c.tar.bz2 |
resolved conflicts for merge of 4a59376d to stage-aosp-master
Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc
Diffstat (limited to 'packages/DefaultContainerService/src')
-rw-r--r-- | packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java index de77cac..d3bd197 100644 --- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java +++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java @@ -71,7 +71,7 @@ import libcore.io.ErrnoException; import libcore.io.IoUtils; import libcore.io.Libcore; import libcore.io.Streams; -import libcore.io.StructStatFs; +import libcore.io.StructStatVfs; /* * This service copies a downloaded apk to a file passed in as @@ -244,7 +244,7 @@ public class DefaultContainerService extends IntentService { Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); try { - final StructStatFs stat = Libcore.os.statfs(path); + final StructStatVfs stat = Libcore.os.statvfs(path); final long totalSize = stat.f_blocks * stat.f_bsize; final long availSize = stat.f_bavail * stat.f_bsize; return new long[] { totalSize, availSize }; |