diff options
| author | Roshan Pius <rpius@google.com> | 2024-04-22 16:38:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-22 16:38:39 +0000 |
| commit | 879ee39e3e725ae57c2390a98838ee1d79e9be9e (patch) | |
| tree | 324fdc355a3da94d9457885ec3296cd2e4270ad7 | |
| parent | c53906e20c878d62329f3cf96b198544c779dc06 (diff) | |
| parent | 38c7b75d40820de7de325e16b791f9243bfe76b3 (diff) | |
| download | Nfc-879ee39e3e725ae57c2390a98838ee1d79e9be9e.tar.gz | |
Merge "Code cleanup: removing doGetLastError() from JNI" into main
| -rw-r--r-- | nci/jni/NativeNfcManager.cpp | 19 | ||||
| -rwxr-xr-x | nci/src/com/android/nfc/dhimpl/NativeNfcManager.java | 2 |
2 files changed, 0 insertions, 21 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 251c3c67..5f97fb78 100644 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -117,7 +117,6 @@ bool isDiscoveryStarted(); ** *****************************************************************************/ namespace android { -static jint sLastError = ERROR_BUFFER_TOO_SMALL; static SyncEvent sNfaEnableEvent; // event for NFA_Enable() static SyncEvent sNfaDisableEvent; // event for NFA_Disable() static SyncEvent sNfaEnableDisablePollingEvent; // event for @@ -1488,22 +1487,6 @@ TheEnd: /******************************************************************************* ** -** Function: nfcManager_doGetLastError -** -** Description: Get the last error code. -** e: JVM environment. -** o: Java object. -** -** Returns: Last error code. -** -*******************************************************************************/ -static jint nfcManager_doGetLastError(JNIEnv*, jobject) { - LOG(DEBUG) << StringPrintf("%s: last error=%i", __func__, sLastError); - return sLastError; -} - -/******************************************************************************* -** ** Function: nfcManager_doDeinitialize ** ** Description: Turn off NFC. @@ -2212,8 +2195,6 @@ static JNINativeMethod gMethods[] = { {"doStartStopPolling", "(Z)V", (void*)nfcManager_doStartStopPolling}, - {"doGetLastError", "()I", (void*)nfcManager_doGetLastError}, - {"disableDiscovery", "()V", (void*)nfcManager_disableDiscovery}, {"doSetTimeout", "(II)Z", (void*)nfcManager_doSetTimeout}, diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java index ab2f0984..db357655 100755 --- a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java +++ b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java @@ -77,8 +77,6 @@ public class NativeNfcManager implements DeviceHost { private native boolean doDownload(); - public native int doGetLastError(); - @Override public boolean checkFirmware() { return doDownload(); |