7 files changed, 19 insertions, 10 deletions
diff --git a/core/java/android/net/LinkCapabilities.aidl b/core/java/android/net/LinkCapabilities.aidl
index 5f47baf0026b..df7259902feb 100644
--- a/core/java/android/net/LinkCapabilities.aidl
+++ b/core/java/android/net/LinkCapabilities.aidl
@@ -1,7 +1,6 @@
 /*
 **
-** Copyright (C) 2009 Qualcomm Innovation Center, Inc.  All Rights Reserved.
-** Copyright (C) 2009 The Android Open Source Project
+** Copyright (C) 2010 The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
diff --git a/core/java/android/net/LinkCapabilities.java b/core/java/android/net/LinkCapabilities.java
index d10a759920db..eb9166ffe360 100644
--- a/core/java/android/net/LinkCapabilities.java
+++ b/core/java/android/net/LinkCapabilities.java
@@ -146,7 +146,7 @@ public class LinkCapabilities implements Parcelable {
         // code these to match
 
         /** Default Role */
-        public static final String DEFAULT = "0";
+        public static final String DEFAULT = "default";
         /** Bulk down load */
         public static final String BULK_DOWNLOAD = "bulk.download";
         /** Bulk upload */
diff --git a/core/java/android/net/LinkProperties.aidl b/core/java/android/net/LinkProperties.aidl
index 73c798804146..9cd06d57844e 100644
--- a/core/java/android/net/LinkProperties.aidl
+++ b/core/java/android/net/LinkProperties.aidl
@@ -1,7 +1,6 @@
 /*
 **
-** Copyright (C) 2009 Qualcomm Innovation Center, Inc.  All Rights Reserved.
-** Copyright (C) 2009 The Android Open Source Project
+** Copyright (C) 2010 The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java
index 24aebfcd2feb..f411eac1b2d9 100644
--- a/core/java/android/net/LinkProperties.java
+++ b/core/java/android/net/LinkProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/java/android/net/LinkSocket.java b/core/java/android/net/LinkSocket.java
index d416ed0955ac..5aa64512dc82 100644
--- a/core/java/android/net/LinkSocket.java
+++ b/core/java/android/net/LinkSocket.java
@@ -197,6 +197,17 @@ public class LinkSocket extends Socket {
 
     /**
      * Connect a duplicate socket socket to the same remote host address and port
+     * as the original with a timeout parameter.
+     * @param timeout the timeout value in milliseconds or 0 for infinite timeout
+     * @throws IOException if the socket is already connected or an error occurs
+     *                     while connecting
+     */
+    public void connect(int timeout) throws IOException {
+        if (DBG) log("connect(timeout) EX");
+    }
+
+    /**
+     * Connect a duplicate socket socket to the same remote host address and port
      * as the original.
      * @throws IOException if the socket is already connected or an error occurs
      *                     while connecting
@@ -237,9 +248,9 @@ public class LinkSocket extends Socket {
      */
     @Override
     @Deprecated
-    public void bind(SocketAddress localAddr) throws IOException {
+    public void bind(SocketAddress localAddr) throws UnsupportedOperationException {
         if (DBG) log("bind(localAddr) EX throws IOException");
-        throw new IOException("bind is deprecated for LinkSocket");
+        throw new UnsupportedOperationException("bind is deprecated for LinkSocket");
     }
 
     /**
diff --git a/core/java/android/net/LinkSocketNotifier.java b/core/java/android/net/LinkSocketNotifier.java
index 183c767dd763..28e2834dc555 100644
--- a/core/java/android/net/LinkSocketNotifier.java
+++ b/core/java/android/net/LinkSocketNotifier.java
@@ -84,5 +84,5 @@ public interface LinkSocketNotifier {
      * Get notified of every capability change
      * check for LinkSockets on that Link that are interested in that Capability - call them
      */
-    public void onCapabilityChanged(LinkSocket socket, LinkCapabilities changedCapabilities);
+    public void onCapabilitiesChanged(LinkSocket socket, LinkCapabilities changedCapabilities);
 }
diff --git a/core/java/android/net/ProxyProperties.java b/core/java/android/net/ProxyProperties.java
index fb59fedaa3d6..140b71fd129a 100644
--- a/core/java/android/net/ProxyProperties.java
+++ b/core/java/android/net/ProxyProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 The Android Open Source Project
+ * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.