Track libcore.os' move to android.system.

(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
This commit is contained in:
Elliott Hughes
2014-04-28 11:11:32 -07:00
parent 3f4867f49d
commit 34385d352d
19 changed files with 111 additions and 117 deletions

View File

@@ -44,6 +44,8 @@ import android.provider.Settings;
import android.sax.Element;
import android.sax.ElementListener;
import android.sax.RootElement;
import android.system.ErrnoException;
import android.system.Os;
import android.text.TextUtils;
import android.util.Log;
import android.util.Xml;
@@ -59,9 +61,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
import libcore.io.ErrnoException;
import libcore.io.Libcore;
/**
* Internal service helper that no-one should use directly.
*
@@ -1129,7 +1128,7 @@ public class MediaScanner
if (path != null && path.startsWith("/")) {
boolean exists = false;
try {
exists = Libcore.os.access(path, libcore.io.OsConstants.F_OK);
exists = Os.access(path, android.system.OsConstants.F_OK);
} catch (ErrnoException e1) {
}
if (!exists && !MtpConstants.isAbstractObject(format)) {