Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e7c24923: Fix a few more stray libcore.io references.

Browse Source 
* commit 'e7c249230b31d6e5d6971c724091d9eecd4e8c43':
  Fix a few more stray libcore.io references.
This commit is contained in:
Elliott Hughes
2014-04-29 03:54:02 +00:00
committed by Android Git Automerger
parent 3484b68f3b c1858228df
commit 512c15964b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/os/ZygoteInit.java
View File

@@ -28,6 +28,7 @@ import android.os.Process;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.Trace;
import android.system.ErrnoException;
import android.system.Os;
import android.system.OsConstants;
import android.util.EventLog;
@@ -200,7 +201,7 @@ public class ZygoteInit {
}
} catch (IOException 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);
}

2
drm/java/android/drm/DrmOutputStream.java
View File

@@ -18,7 +18,7 @@ package android.drm;
import static android.drm.DrmConvertedStatus.STATUS_OK;
import static android.drm.DrmManagerClient.INVALID_SESSION;
import static libcore.io.OsConstants.SEEK_SET;
import static android.system.OsConstants.SEEK_SET;
import android.os.ParcelFileDescriptor;
import android.system.ErrnoException;