Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76a562d4 authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Cleanup copyright dates add missing method."

parents 04f8040d 6e80997a

core/java/android/net/LinkCapabilities.aidl

+1 −2
Original line number Diff line number Diff line 
/*

**

** 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.

core/java/android/net/LinkCapabilities.java

+1 −1
Original line number Diff line number Diff line
@@ -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 */

core/java/android/net/LinkProperties.aidl

+1 −2
Original line number Diff line number Diff line 
/*

**

** 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.

core/java/android/net/LinkProperties.java

+1 −1
Original line number Diff line number Diff line 
/*

 * 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.

core/java/android/net/LinkSocket.java

+13 −2
Original line number Diff line number Diff line
@@ -195,6 +195,17 @@ public class LinkSocket extends Socket { 
        if (DBG) log("connect(remoteAddr) EX DEPRECATED");

    }



    /**

     * 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.
@@ -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");

    }



    /**