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

Commit 28e8c66d authored by Nick Pelly's avatar Nick Pelly Committed by Android Git Automerger
Browse files

am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread 

* commit 'd8c32332':
  Fixed technology name typo's.
  Implement historical bytes / attrib on IsoDep
  Provide system code and manufacturer code for Felica tech.
  Fixed NfcAdapter init and getTechnology().
  Secure Element access implementation
  Rough first pass at the NFC technology API.
  Revert "Merge "Remove the My Tag feature." into gingerbread"
parents 18cbfecd d8c32332

Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -119,11 +119,11 @@ LOCAL_SRC_FILES += \ 
	core/java/android/nfc/ILlcpConnectionlessSocket.aidl \

	core/java/android/nfc/ILlcpServiceSocket.aidl \

	core/java/android/nfc/ILlcpSocket.aidl \

	core/java/android/nfc/INdefTag.aidl \

	core/java/android/nfc/INfcAdapter.aidl \

	core/java/android/nfc/INfcTag.aidl \

	core/java/android/nfc/IP2pInitiator.aidl \

	core/java/android/nfc/IP2pTarget.aidl \

    core/java/android/nfc/INfcSecureElement.aidl \

	core/java/android/os/IHardwareService.aidl \

	core/java/android/os/IMessenger.aidl \

	core/java/android/os/INetworkManagementService.aidl \
@@ -252,7 +252,6 @@ aidl_files := \ 
	frameworks/base/core/java/android/nfc/NdefMessage.aidl \

	frameworks/base/core/java/android/nfc/NdefRecord.aidl \

	frameworks/base/core/java/android/nfc/Tag.aidl \

	frameworks/base/core/java/android/nfc/NdefTag.aidl \

	frameworks/base/core/java/android/os/Bundle.aidl \

	frameworks/base/core/java/android/os/DropBoxManager.aidl \

	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/trustedlogic)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/nfc/INdefTag.java)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/java/android/nfc/INfcAdapter.aidl

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.nfc.ILlcpConnectionlessSocket; 
import android.nfc.INfcTag;

import android.nfc.IP2pTarget;

import android.nfc.IP2pInitiator;

import android.nfc.INfcSecureElement;



/**

 * @hide
@@ -36,9 +37,12 @@ interface INfcAdapter 
    INfcTag getNfcTagInterface();

    IP2pTarget getP2pTargetInterface();

    IP2pInitiator getP2pInitiatorInterface();

    INfcSecureElement getNfcSecureElementInterface();



    // NfcAdapter-class related methods

    boolean isEnabled();

    NdefMessage localGet();

    void localSet(in NdefMessage message);

    void openTagConnection(in Tag tag);



    // Non-public methods

core/java/android/nfc/INdefTag.aidl→core/java/android/nfc/INfcSecureElement.aidl

100644 → 100755
+7 −7
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


package android.nfc;



import android.nfc.NdefMessage;



/**

 * @hide

 * {@hide}

 */

interface INdefTag

{

    NdefMessage read(int nativeHandle);

    boolean write(int nativeHandle, in NdefMessage msg);

interface INfcSecureElement {

    int openSecureElementConnection();

    int closeSecureElementConnection(int nativeHandle);

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

    int[] getSecureElementTechList(int nativeHandle);

    byte[] getSecureElementUid(int nativeHandle);

}
 
 No newline at end of file

core/java/android/nfc/INfcTag.aidl

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ interface INfcTag 
{

    int close(int nativeHandle);

    int connect(int nativeHandle);

    String getType(int nativeHandle);

    int[] getTechList(int nativeHandle);

    byte[] getUid(int nativeHandle);

    boolean isNdef(int nativeHandle);

    boolean isPresent(int nativeHandle);