Fix build error

Change-Id: I6f52954a780b747f1ad2a4e429ef192d58c40e76
This commit is contained in:
Bill Yi
2014-04-29 18:52:48 -07:00
parent 263c36a144
commit 9a76e9ba1a

View File

@ -28,6 +28,7 @@ import android.os.Process;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.Trace; import android.os.Trace;
import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.system.OsConstants; import android.system.OsConstants;
import android.util.EventLog; import android.util.EventLog;
@ -195,12 +196,12 @@ public class ZygoteInit {
FileDescriptor fd = sServerSocket.getFileDescriptor(); FileDescriptor fd = sServerSocket.getFileDescriptor();
sServerSocket.close(); sServerSocket.close();
if (fd != null) { if (fd != null) {
Libcore.os.close(fd); Os.close(fd);
} }
} }
} catch (IOException ex) { } catch (IOException ex) {
Log.e(TAG, "Zygote: error closing sockets", ex); Log.e(TAG, "Zygote: error closing sockets", ex);
} catch (libcore.io.ErrnoException ex) { } catch (ErrnoException ex) {
Log.e(TAG, "Zygote: error closing descriptor", ex); Log.e(TAG, "Zygote: error closing descriptor", ex);
} }
@ -244,9 +245,11 @@ public class ZygoteInit {
} }
static void preload() { static void preload() {
Log.d(TAG, "begin preload");
preloadClasses(); preloadClasses();
preloadResources(); preloadResources();
preloadOpenGL(); preloadOpenGL();
Log.d(TAG, "end preload");
} }
private static void preloadOpenGL() { private static void preloadOpenGL() {