summaryrefslogtreecommitdiffstats
path: root/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
diff options
context:
space:
mode:
Diffstat (limited to 'nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java')
-rwxr-xr-xnxp/src/com/android/nfc/dhimpl/NativeNfcManager.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
index 36b6ea8..0446390 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -38,6 +38,8 @@ public class NativeNfcManager implements DeviceHost {
private static final String NFC_CONTROLLER_FIRMWARE_FILE_NAME = "/vendor/firmware/libpn544_fw.so";
+ private static final String NFC_CONTROLLER_FIRMWARE_FILE_NAME_2 = "/system/lib/libpn544_fw.so";
+
static final String PREF = "NxpDeviceHost";
private static final String PREF_FIRMWARE_MODTIME = "firmware_modtime";
@@ -101,6 +103,9 @@ public class NativeNfcManager implements DeviceHost {
int nbRetry = 0;
try {
firmwareFile = new File(NFC_CONTROLLER_FIRMWARE_FILE_NAME);
+ if (!firmwareFile.exists()) {
+ firmwareFile = new File(NFC_CONTROLLER_FIRMWARE_FILE_NAME_2);
+ }
} catch(NullPointerException npe) {
Log.e(TAG,"path to firmware file was null");
return;