Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Connecting to a NFC technology may fail."

Browse Source
This commit is contained in:
Martijn Coenen
2011-06-06 13:46:47 -07:00
committed by Android (Google) Code Review
parent 49470743fa ea51a4275a
commit 4e75dbb94d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/nfc/ErrorCodes.java
View File

@@ -57,6 +57,7 @@ public class ErrorCodes {
case ERROR_SE_ALREADY_SELECTED: return "SE_ALREADY_SELECTED";
case ERROR_SE_CONNECTED: return "SE_CONNECTED";
case ERROR_NO_SE_CONNECTED: return "NO_SE_CONNECTED";
case ERROR_NOT_SUPPORTED: return "NOT_SUPPORTED";
default: return "UNKNOWN ERROR";
}
}
@@ -105,4 +106,6 @@ public class ErrorCodes {
public static final int ERROR_NO_SE_CONNECTED = -20;
}
public static final int ERROR_NOT_SUPPORTED = -21;
}

4
core/java/android/nfc/tech/BasicTagTechnology.java
View File

@@ -77,6 +77,10 @@ import java.io.IOException;
// Store this in the tag object
mTag.setConnectedTechnology(mSelectedTechnology);
mIsConnected = true;
} else if (errorCode == ErrorCodes.ERROR_NOT_SUPPORTED) {
throw new UnsupportedOperationException("Connecting to " +
"this technology is not supported by the NFC " +
"adapter.");
} else {
throw new IOException();
}