diff options
author | Elliott Hughes <enh@google.com> | 2014-04-28 21:02:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-28 21:02:12 +0000 |
commit | c3e99e39ce33c129376d023e8b1ee8c9990f7020 (patch) | |
tree | 18945a6f91b6ed1f9f5b4e7fb30c317d58fe3d77 /src/com/android/providers | |
parent | e28cab83cfb462245ffc8cfe6bd3bfe4917abda6 (diff) | |
parent | 98109a4bea074d49106545a349c1b8a401e6635b (diff) | |
download | android_packages_providers_MediaProvider-c3e99e39ce33c129376d023e8b1ee8c9990f7020.tar.gz android_packages_providers_MediaProvider-c3e99e39ce33c129376d023e8b1ee8c9990f7020.tar.bz2 android_packages_providers_MediaProvider-c3e99e39ce33c129376d023e8b1ee8c9990f7020.zip |
am 98109a4b: am 9adb079c: Merge "Track API package change."
* commit '98109a4bea074d49106545a349c1b8a401e6635b':
Track API package change.
Diffstat (limited to 'src/com/android/providers')
-rwxr-xr-x | src/com/android/providers/media/MediaProvider.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java index 1d4209aa..53457415 100755 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -81,15 +81,15 @@ import android.provider.MediaStore.Images; import android.provider.MediaStore.Images.ImageColumns; import android.provider.MediaStore.MediaColumns; import android.provider.MediaStore.Video; +import android.system.ErrnoException; +import android.system.Os; +import android.system.OsConstants; +import android.system.StructStat; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; -import libcore.io.ErrnoException; import libcore.io.IoUtils; -import libcore.io.Libcore; -import libcore.io.OsConstants; -import libcore.io.StructStat; import java.io.File; import java.io.FileDescriptor; @@ -4694,7 +4694,7 @@ public class MediaProvider extends ContentProvider { private void checkWorldReadAccess(String path) throws FileNotFoundException { try { - StructStat stat = Libcore.os.stat(path); + StructStat stat = Os.stat(path); int accessBits = OsConstants.S_IROTH; if (OsConstants.S_ISREG(stat.st_mode) && ((stat.st_mode & accessBits) == accessBits)) { @@ -4721,7 +4721,7 @@ public class MediaProvider extends ContentProvider { throw new FileNotFoundException("access denied"); } try { - StructStat stat = Libcore.os.stat(parent.getPath()); + StructStat stat = Os.stat(parent.getPath()); if ((stat.st_mode & accessBits) != accessBits) { // the parent dir doesn't have the appropriate access throw new FileNotFoundException("Can't access " + filePath); |