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

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

Merge branch 'gingerbread' into gingerbread-release

parents 9c7800e3 2088e371

core/java/android/nfc/ErrorCodes.java

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

    }



    public static String asString(int code) {

        switch (code) {

            case SUCCESS: return "SUCCESS";

            case ERROR_IO: return "IO";

            case ERROR_CANCELLED: return "CANCELLED";

            case ERROR_TIMEOUT: return "TIMEOUT";

            case ERROR_BUSY: return "BUSY";

            case ERROR_CONNECT: return "CONNECT/DISCONNECT";

//            case ERROR_DISCONNECT: return "DISCONNECT";

            case ERROR_READ: return "READ";

            case ERROR_WRITE: return "WRITE";

            case ERROR_INVALID_PARAM: return "INVALID_PARAM";

            case ERROR_INSUFFICIENT_RESOURCES: return "INSUFFICIENT_RESOURCES";

            case ERROR_SOCKET_CREATION: return "SOCKET_CREATION";

            case ERROR_SOCKET_NOT_CONNECTED: return "SOCKET_NOT_CONNECTED";

            case ERROR_BUFFER_TO_SMALL: return "BUFFER_TO_SMALL";

            case ERROR_SAP_USED: return "SAP_USED";

            case ERROR_SERVICE_NAME_USED: return "SERVICE_NAME_USED";

            case ERROR_SOCKET_OPTIONS: return "SOCKET_OPTIONS";

            case ERROR_NFC_ON: return "NFC_ON";

            case ERROR_NOT_INITIALIZED: return "NOT_INITIALIZED";

            case ERROR_SE_ALREADY_SELECTED: return "SE_ALREADY_SELECTED";

            case ERROR_SE_CONNECTED: return "SE_CONNECTED";

            case ERROR_NO_SE_CONNECTED: return "NO_SE_CONNECTED";

            default: return "UNKNOWN ERROR";

        }

    }



    public static final int SUCCESS = 0;



    public static final int ERROR_IO = -1;

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

+2 −1
Original line number Diff line number Diff line
@@ -78,8 +78,9 @@ public class LlcpServiceSocket { 
	 * @param handle

	 *            The handle returned by the NFC service and used to identify

	 *            the socket in subsequent calls.

	 * @hide

	 */

	LlcpServiceSocket(ILlcpServiceSocket service, ILlcpSocket socketService, int handle) {

	public LlcpServiceSocket(ILlcpServiceSocket service, ILlcpSocket socketService, int handle) {

		this.mService = service;

		this.mHandle = handle;

		this.mLlcpSocketService = socketService;

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

+2 −1
Original line number Diff line number Diff line
@@ -78,8 +78,9 @@ public class LlcpSocket { 
	 * @param handle

	 *            The handle returned by the NFC service and used to identify

	 *            the socket in subsequent calls.

	 * @hide

	 */

	LlcpSocket(ILlcpSocket service, int handle) {

	public LlcpSocket(ILlcpSocket service, int handle) {

		this.mService = service;

		this.mHandle = handle;

	}

data/sounds/AudioPackage5.mk

+5 −5
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/ringtones/Pegasus.ogg:system/media/audio/ringtones/Pegasus.ogg \

	$(LOCAL_PATH)/ringtones/PERSEUS.ogg:system/media/audio/ringtones/PERSEUS.ogg \

	$(LOCAL_PATH)/ringtones/Pyxis.ogg:system/media/audio/ringtones/Pyxis.ogg \

	$(LOCAL_PATH)/ringtones/Rigel.ogg:system/media/audio/notifications/Rigel.ogg \

	$(LOCAL_PATH)/ringtones/Scarabaeus.ogg:system/media/audio/notifications/Scarabaeus.ogg \

	$(LOCAL_PATH)/ringtones/Sceptrum.ogg:system/media/audio/notifications/Sceptrum.ogg \

	$(LOCAL_PATH)/ringtones/Solarium.ogg:system/media/audio/notifications/Solarium.ogg \

	$(LOCAL_PATH)/ringtones/Testudo.ogg:system/media/audio/notifications/Testudo.ogg \

	$(LOCAL_PATH)/ringtones/Rigel.ogg:system/media/audio/ringtones/Rigel.ogg \

	$(LOCAL_PATH)/ringtones/Scarabaeus.ogg:system/media/audio/ringtones/Scarabaeus.ogg \

	$(LOCAL_PATH)/ringtones/Sceptrum.ogg:system/media/audio/ringtones/Sceptrum.ogg \

	$(LOCAL_PATH)/ringtones/Solarium.ogg:system/media/audio/ringtones/Solarium.ogg \

	$(LOCAL_PATH)/ringtones/Testudo.ogg:system/media/audio/ringtones/Testudo.ogg \

	$(LOCAL_PATH)/ringtones/URSAMINOR.ogg:system/media/audio/ringtones/URSAMINOR.ogg \

	$(LOCAL_PATH)/ringtones/Vespa.ogg:system/media/audio/ringtones/Vespa.ogg

data/sounds/notifications/arcturus.ogg

100755 → 100644
+353 B (7.96 KiB)

File changed.File mode changed from 100755 to 100644.

No diff preview for this file type.

View original file
View changed file