diff options
author | Alexandra Ducati-Manas <alexandra.ducati-manas@st.com> | 2024-04-18 15:57:10 +0200 |
---|---|---|
committer | Alexandra Ducati-Manas <alexandra.ducati-manas@st.com> | 2024-04-19 12:15:52 +0200 |
commit | 3e8676b4b0d602cec16913c49ddda1ea3d5e1ea1 (patch) | |
tree | c10725015b9b5847144acbeab9373d9e932b372e | |
parent | 38c7b75d40820de7de325e16b791f9243bfe76b3 (diff) | |
download | Nfc-3e8676b4b0d602cec16913c49ddda1ea3d5e1ea1.tar.gz |
Code cleanup: removed remaining P2P functions in JNI
Removed nfcManager_doSetP2pInitiatorModes and
nfcManager_doSetP2pTargetModes
Bug: 335639730
Change-Id: I69f556f6b7b62e1b35837556e1a6583295cc83f2
-rw-r--r-- | nci/jni/NativeNfcManager.cpp | 54 | ||||
-rwxr-xr-x | nci/src/com/android/nfc/dhimpl/NativeNfcManager.java | 14 | ||||
-rw-r--r-- | src/com/android/nfc/DeviceHost.java | 4 |
3 files changed, 0 insertions, 72 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 5f97fb78..a8b05c75 100644 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -1817,55 +1817,6 @@ static void nfcManager_doSetScreenState(JNIEnv* e, jobject o, prevScreenState = state; } -/******************************************************************************* -** -** Function: nfcManager_doSetP2pInitiatorModes -** -** Description: Set P2P initiator's activation modes. -** e: JVM environment. -** o: Java object. -** modes: Active and/or passive modes. The values are -*specified -** in external/libnfc-nxp/inc/phNfcTypes.h. See -** enum phNfc_eP2PMode_t. -** -** Returns: None. -** -*******************************************************************************/ -static void nfcManager_doSetP2pInitiatorModes(JNIEnv* e, jobject o, - jint modes) { - LOG(DEBUG) << StringPrintf("%s: modes=0x%X", __func__, modes); - struct nfc_jni_native_data* nat = getNative(e, o); - - if (nat == NULL) { - LOG(ERROR) << StringPrintf("nat is null"); - return; - } - tNFA_TECHNOLOGY_MASK mask = 0; - if (modes & 0x01) mask |= NFA_TECHNOLOGY_MASK_A; - if (modes & 0x02) mask |= NFA_TECHNOLOGY_MASK_F; - if (modes & 0x04) mask |= NFA_TECHNOLOGY_MASK_F; - if (modes & 0x08) mask |= NFA_TECHNOLOGY_MASK_A_ACTIVE; - if (modes & 0x10) mask |= NFA_TECHNOLOGY_MASK_F_ACTIVE; - if (modes & 0x20) mask |= NFA_TECHNOLOGY_MASK_F_ACTIVE; - nat->tech_mask = mask; -} - -/******************************************************************************* -** -** Function: nfcManager_doSetP2pTargetModes -** -** Description: Set P2P target's activation modes. -** e: JVM environment. -** o: Java object. -** modes: Active and/or passive modes. -** -** Returns: None. -** -*******************************************************************************/ -static void nfcManager_doSetP2pTargetModes(JNIEnv*, jobject, jint modes) { - LOG(DEBUG) << StringPrintf("%s: modes=0x%X", __func__, modes); -} static void nfcManager_doEnableScreenOffSuspend(JNIEnv* e, jobject o) { PowerSwitch::getInstance().setScreenOffPowerState( @@ -2205,11 +2156,6 @@ static JNINativeMethod gMethods[] = { {"doAbort", "(Ljava/lang/String;)V", (void*)nfcManager_doAbort}, - {"doSetP2pInitiatorModes", "(I)V", - (void*)nfcManager_doSetP2pInitiatorModes}, - - {"doSetP2pTargetModes", "(I)V", (void*)nfcManager_doSetP2pTargetModes}, - {"doEnableScreenOffSuspend", "()V", (void*)nfcManager_doEnableScreenOffSuspend}, diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java index db357655..631b43a7 100755 --- a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java +++ b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java @@ -288,20 +288,6 @@ public class NativeNfcManager implements DeviceHost { public native int getAidTableSize(); - private native void doSetP2pInitiatorModes(int modes); - - @Override - public void setP2pInitiatorModes(int modes) { - doSetP2pInitiatorModes(modes); - } - - private native void doSetP2pTargetModes(int modes); - - @Override - public void setP2pTargetModes(int modes) { - doSetP2pTargetModes(modes); - } - @Override public boolean getExtendedLengthApdusSupported() { /* 261 is the default size if extended length frames aren't supported */ diff --git a/src/com/android/nfc/DeviceHost.java b/src/com/android/nfc/DeviceHost.java index 41b0cfb8..3ed7021c 100644 --- a/src/com/android/nfc/DeviceHost.java +++ b/src/com/android/nfc/DeviceHost.java @@ -178,10 +178,6 @@ public interface DeviceHost { public int getAidTableSize(); - void setP2pInitiatorModes(int modes); - - void setP2pTargetModes(int modes); - boolean getExtendedLengthApdusSupported(); void dump(FileDescriptor fd); |