auto import from //depot/cupcake/@136654

diff --git a/libcore/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java b/libcore/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java
index a71c558..952b81a 100644 (file)
--- a/libcore/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java
+++ b/libcore/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java
@@ -17,6 +17,8 @@
 
 package javax.security.auth.callback;
 
+import java.io.IOException;
+
 /**
  * Needs to be implemented by classes that want to handle authentication
  * {@link Callback}s. A single method {@link #handle(Callback[])} must be
@@ -49,6 +51,6 @@ public interface CallbackHandler {
      *             if the {@code CallbackHandler} is not able to handle a
      *             specific {@code Callback}
      */
-    void handle(Callback[] callbacks) throws java.io.IOException, UnsupportedCallbackException;
+    void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException;
 
 }

diff --git a/libcore/luni/src/test/java/tests/api/java/net/ServerSocketTest.java b/libcore/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
index 36e092d..ecdfd01 100644 (file)
--- a/libcore/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
@@ -46,15 +46,7 @@ import java.util.Properties;
 import tests.support.Support_Configuration;
 import tests.support.Support_PortManager;
 
-@TestTargetClass(value = ServerSocket.class, 
-                 untestedMethods = {
-                    @TestTargetNew(
-                        level = TestLevel.NOT_NECESSARY,
-                        notes = "Protected constructor.",
-                        method = "ServerSocket",
-                        args = {SocketImpl.class}
-                    )}
-                ) 
+@TestTargetClass(value = ServerSocket.class) 
 public class ServerSocketTest extends SocketTestCase {
 
     boolean interrupted;