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

Merge "Throw IOException on multiple connects."

Browse Source
This commit is contained in:
Alisher Alikhodjaev
2020-01-22 01:27:04 +00:00
committed by Gerrit Code Review
parent e9beb8ddbc 3eb265ae00
commit 632e515468
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/nfc/Tag.java
View File

@@ -455,12 +455,12 @@ public final class Tag implements Parcelable {
*
* @hide
*/
public synchronized void setConnectedTechnology(int technology) {
if (mConnectedTechnology == -1) {
mConnectedTechnology = technology;
} else {
throw new IllegalStateException("Close other technology first!");
public synchronized boolean setConnectedTechnology(int technology) {
if (mConnectedTechnology != -1) {
return false;
}
mConnectedTechnology = technology;
return true;
}
/**

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

@@ -75,7 +75,10 @@ abstract class BasicTagTechnology implements TagTechnology {
if (errorCode == ErrorCodes.SUCCESS) {
// Store this in the tag object
mTag.setConnectedTechnology(mSelectedTechnology);
if (!mTag.setConnectedTechnology(mSelectedTechnology)) {
Log.e(TAG, "Close other technology first!");
throw new IOException("Only one TagTechnology can be connected at a time.");
}
mIsConnected = true;
} else if (errorCode == ErrorCodes.ERROR_NOT_SUPPORTED) {
throw new UnsupportedOperationException("Connecting to " +