summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-28 20:49:24 -0700
committerElliott Hughes <enh@google.com>2014-04-28 20:49:24 -0700
commitc1858228df18528aabe1ff223335f613be2b99d8 (patch)
tree17ebf5987996fa58c3e8b10a43b213d771f40fdf
parent33ee1e779d20fba8f8379296641c12cd6982506e (diff)
downloadframeworks_base-c1858228df18528aabe1ff223335f613be2b99d8.zip
frameworks_base-c1858228df18528aabe1ff223335f613be2b99d8.tar.gz
frameworks_base-c1858228df18528aabe1ff223335f613be2b99d8.tar.bz2
Fix a few more stray libcore.io references.
Change-Id: Id328544bd3a382fec16507d0ae5b699fef44ebd7
-rw-r--r--core/java/com/android/internal/os/ZygoteInit.java3
-rw-r--r--drm/java/android/drm/DrmOutputStream.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 4427ab5..3ea749e 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -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);
}
diff --git a/drm/java/android/drm/DrmOutputStream.java b/drm/java/android/drm/DrmOutputStream.java
index 5b1ca63..ba1c56f 100644
--- a/drm/java/android/drm/DrmOutputStream.java
+++ b/drm/java/android/drm/DrmOutputStream.java
@@ -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;