Switch from InetUnixAddress to UnixSocketAddress UnixSocketAddress is replacing InetUnixAddress. Bug: 3106438 Change-Id: I7c03fa357adfb3221908294fd254c8faae91fd1b
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) {