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

Commit cf046b98 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 96c58e59 906b830d

core/java/android/nfc/ILlcpServiceSocket.aidl

+0 −2
Original line number Diff line number Diff line
@@ -23,6 +23,4 @@ interface ILlcpServiceSocket 
{

    int accept(int nativeHandle);

    void close(int nativeHandle);

    int getAcceptTimeout(int nativeHandle);

    void setAcceptTimeout(int nativeHandle, int timeout);

}

core/java/android/nfc/ILlcpSocket.aidl

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ interface ILlcpSocket 
    int close(int nativeHandle);

    int connect(int nativeHandle, int sap);

    int connectByName(int nativeHandle, String sn);

    int getConnectTimeout(int nativeHandle);

    int getLocalSap(int nativeHandle);

    int getLocalSocketMiu(int nativeHandle);

    int getLocalSocketRw(int nativeHandle);
@@ -32,5 +31,4 @@ interface ILlcpSocket 
    int getRemoteSocketRw(int nativeHandle);

    int receive(int nativeHandle, out byte[] receiveBuffer);

    int send(int nativeHandle, in byte[] data);

    void setConnectTimeout(int nativeHandle, int timeout);

}
 
 No newline at end of file

core/java/android/nfc/NdefMessage.java

+5 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.nfc;



import android.nfc.NdefRecord;

import android.os.Parcel;

import android.os.Parcelable;
@@ -69,11 +68,10 @@ public final class NdefMessage implements Parcelable { 
     * Returns a byte array representation of this entire NDEF message.

     */

    public byte[] toByteArray() {

        //TODO: do not return null

        //TODO: allocate the byte array once, copy each record once

        //TODO: process MB and ME flags outside loop

        if ((mRecords == null) || (mRecords.length == 0))

            return null;

            return new byte[0];



        byte[] msg = {};
@@ -104,10 +102,12 @@ public final class NdefMessage implements Parcelable { 
        return msg;

    }



    @Override

    public int describeContents() {

        return 0;

    }



    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(mRecords.length);

        dest.writeTypedArray(mRecords, flags);
@@ -115,12 +115,14 @@ public final class NdefMessage implements Parcelable { 


    public static final Parcelable.Creator<NdefMessage> CREATOR =

            new Parcelable.Creator<NdefMessage>() {

        @Override

        public NdefMessage createFromParcel(Parcel in) {

            int recordsLength = in.readInt();

            NdefRecord[] records = new NdefRecord[recordsLength];

            in.readTypedArray(records, NdefRecord.CREATOR);

            return new NdefMessage(records);

        }

        @Override

        public NdefMessage[] newArray(int size) {

            return new NdefMessage[size];

        }

core/java/com/android/internal/nfc/LlcpServiceSocket.java

+0 −28
Original line number Diff line number Diff line
@@ -121,34 +121,6 @@ public class LlcpServiceSocket { 


	}



	/**

	 * Set the timeout for the accept request

	 *

	 * @param timeout

	 *            value of the timeout for the accept request

	 */

	public void setAcceptTimeout(int timeout) {

		try {

			mService.setAcceptTimeout(mHandle, timeout);

		} catch (RemoteException e) {

			Log.e(TAG, "RemoteException in setAcceptTimeout(): ", e);

		}

	}



	/**

	 * Get the timeout value of the accept request

	 *

	 * @return mTimeout

	 */

	public int getAcceptTimeout() {

		try {

			return mService.getAcceptTimeout(mHandle);

		} catch (RemoteException e) {

			Log.e(TAG, "RemoteException in getAcceptTimeout(): ", e);

			return 0;

		}

	}



	/**

	 * Close the created Llcp Service socket

	 */

core/java/com/android/internal/nfc/LlcpSocket.java

+0 −28
Original line number Diff line number Diff line
@@ -139,34 +139,6 @@ public class LlcpSocket { 
		}

	}



	/**

	 * Set the timeout for the connect request

	 *

	 * @param timeout

	 *            timeout value for the connect request

	 */

	public void setConnectTimeout(int timeout) {

		try {

			mService.setConnectTimeout(mHandle, timeout);

		} catch (RemoteException e) {

			Log.e(TAG, "RemoteException in setConnectTimeout(): ", e);

		}

	}



	/**

	 * Get the timeout value of the connect request

	 *

	 * @return mTimeout

	 */

	public int getConnectTimeout() {

		try {

			return mService.getConnectTimeout(mHandle);

		} catch (RemoteException e) {

			Log.e(TAG, "RemoteException in getConnectTimeout(): ", e);

			return 0;

		}

	}



	/**

	 * Disconnect request to the connected LLCP socket and close the created

	 * socket.