commit e9d537506bf19375fb932ac7d25ac9a9e3aef61d
author Neil Fuller <nfuller@google.com> Tue Jul 07 16:58:00 2015 +0100
committer Neil Fuller <nfuller@google.com> Tue Jul 07 16:58:00 2015 +0100
tree 49c0e610cd8e35e7dc8e00bd681f030481326a33
parent 4fa438ef72d125b4c0e7eb37a6667ca51ed325e4

Switch from InetUnixAddress to UnixSocketAddress

UnixSocketAddress is replacing InetUnixAddress.

Bug: 3106438
Change-Id: I7c03fa357adfb3221908294fd254c8faae91fd1b

services/core/java/com/android/server/am/NativeCrashListener.java

diff --git a/services/core/java/com/android/server/am/NativeCrashListener.java b/services/core/java/com/android/server/am/NativeCrashListener.java
index d42d415..ca0d578 100644
--- a/services/core/java/com/android/server/am/NativeCrashListener.java
+++ b/services/core/java/com/android/server/am/NativeCrashListener.java
@@ -21,6 +21,7 @@
 import android.system.Os;
 import android.system.StructTimeval;
 import android.system.StructUcred;
+import android.system.UnixSocketAddress;
 import android.util.Slog;
 
 import static android.system.OsConstants.*;
@@ -30,7 +31,6 @@
 import java.io.FileDescriptor;
 import java.io.InterruptedIOException;
 import java.net.InetSocketAddress;
-import java.net.InetUnixAddress;
 
 /**
  * Set up a Unix domain socket that debuggerd will connect() to in
@@ -117,8 +117,9 @@
 
         try {
             FileDescriptor serverFd = Os.socket(AF_UNIX, SOCK_STREAM, 0);
-            final InetUnixAddress sockAddr = new InetUnixAddress(DEBUGGERD_SOCKET_PATH);
-            Os.bind(serverFd, sockAddr, 0);
+            final UnixSocketAddress sockAddr = UnixSocketAddress.createFileSystem(
+                    DEBUGGERD_SOCKET_PATH);
+            Os.bind(serverFd, sockAddr);
             Os.listen(serverFd, 1);
 
             while (true) {