diff options
| author | Alexandra Ducati-Manas <alexandra.ducati-manas@st.com> | 2024-04-18 18:06:43 +0200 |
|---|---|---|
| committer | Alexandra Ducati-Manas <alexandra.ducati-manas@st.com> | 2024-04-23 06:59:23 +0000 |
| commit | 74ac11e455b8d01f8671b7a4542d1d3ed1154f57 (patch) | |
| tree | 46cd9ccd9608dc98d5eb4a61fda4f0d118562aa2 | |
| parent | 879ee39e3e725ae57c2390a98838ee1d79e9be9e (diff) | |
| download | Nfc-74ac11e455b8d01f8671b7a4542d1d3ed1154f57.tar.gz | |
Code cleanup: removed getNfaStorageDir()
Bug: 335639730
Change-Id: I439f77c2300016b55a5a8102338d7bc4ef05060e
| -rw-r--r-- | nci/jni/NativeNfcManager.cpp | 8 | ||||
| -rwxr-xr-x | nci/src/com/android/nfc/dhimpl/NativeNfcManager.java | 3 | ||||
| -rw-r--r-- | src/com/android/nfc/DeviceHost.java | 2 | ||||
| -rw-r--r-- | src/com/android/nfc/NfcService.java | 4 |
4 files changed, 0 insertions, 17 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index 5f97fb78..525f170b 100644 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -1952,11 +1952,6 @@ static jboolean nfcManager_doSetNfcSecure(JNIEnv* e, jobject o, return true; } -static jstring nfcManager_doGetNfaStorageDir(JNIEnv* e, jobject o) { - string nfaStorageDir = NfcConfig::getString(NAME_NFA_STORAGE, "/data/nfc"); - return e->NewStringUTF(nfaStorageDir.c_str()); -} - static void nfcManager_doSetNfceePowerAndLinkCtrl(JNIEnv* e, jobject o, jboolean enable) { RoutingManager& routingManager = RoutingManager::getInstance(); @@ -2233,9 +2228,6 @@ static JNINativeMethod gMethods[] = { {"doSetNfcSecure", "(Z)Z", (void*)nfcManager_doSetNfcSecure}, - {"getNfaStorageDir", "()Ljava/lang/String;", - (void*)nfcManager_doGetNfaStorageDir}, - {"doSetNfceePowerAndLinkCtrl", "(Z)V", (void*)nfcManager_doSetNfceePowerAndLinkCtrl}, diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java index db357655..af7e3e7c 100755 --- a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java +++ b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java @@ -339,9 +339,6 @@ public class NativeNfcManager implements DeviceHost { return doSetNfcSecure(enable); } - @Override - public native String getNfaStorageDir(); - private native void doStartStopPolling(boolean start); @Override diff --git a/src/com/android/nfc/DeviceHost.java b/src/com/android/nfc/DeviceHost.java index 41b0cfb8..438d6578 100644 --- a/src/com/android/nfc/DeviceHost.java +++ b/src/com/android/nfc/DeviceHost.java @@ -204,8 +204,6 @@ public interface DeviceHost { public boolean setNfcSecure(boolean enable); - public String getNfaStorageDir(); - public boolean isObserveModeSupported(); public boolean setObserveMode(boolean enable); diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index ca6971fe..8456ea10 100644 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -3883,10 +3883,6 @@ public class NfcService implements DeviceHostListener, ForegroundUtils.Callback } } - public String getNfaStorageDir() { - return mDeviceHost.getNfaStorageDir(); - } - private void copyNativeCrashLogsIfAny(PrintWriter pw) { try { File file = new File(NATIVE_LOG_FILE_PATH, NATIVE_LOG_FILE_NAME); |