Merge "Code cleanup: removed NativeP2pDevice file and dependencies" into main
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 786f397..c8b7e59 100644
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -131,9 +131,7 @@
static bool sRfEnabled = false; // whether RF discovery is enabled
static bool sSeRfActive = false; // whether RF with SE is likely active
static bool sReaderModeEnabled =
- false; // whether we're only reading tags, not allowing P2p/card emu
-static bool sP2pEnabled = false;
-static bool sP2pActive = false; // whether p2p was last active
+ false; // whether we're only reading tags, not allowing card emu
static bool sAbortConnlessWait = false;
static jint sLfT3tMax = 0;
static bool sRoutingInitialized = false;
@@ -152,7 +150,6 @@
static void nfaConnectionCallback(uint8_t event, tNFA_CONN_EVT_DATA* eventData);
static void nfaDeviceManagementCallback(uint8_t event,
tNFA_DM_CBACK_DATA* eventData);
-static bool isPeerToPeer(tNFA_ACTIVATED& activated);
static bool isListenMode(tNFA_ACTIVATED& activated);
static tNFA_STATUS stopPolling_rfDiscoveryDisabled();
static tNFA_STATUS startPolling_rfDiscoveryDisabled(
@@ -233,25 +230,13 @@
return;
}
- bool isP2p = natTag.isP2pDiscovered();
-
if (natTag.getNumDiscNtf() > 1) {
natTag.setMultiProtocolTagSupport(true);
- if (isP2p) {
- // Remove NFC_DEP NTF count
- // Skip NFC_DEP protocol in MultiProtocolTag select.
- natTag.setNumDiscNtf(natTag.getNumDiscNtf() - 1);
- }
}
- if (sP2pEnabled && !sReaderModeEnabled && isP2p) {
- // select the peer that supports P2P
- natTag.selectP2p();
- } else {
- natTag.setNumDiscNtf(natTag.getNumDiscNtf() - 1);
- // select the first of multiple tags that is discovered
- natTag.selectFirstTag();
- }
+ natTag.setNumDiscNtf(natTag.getNumDiscNtf() - 1);
+ // select the first of multiple tags that is discovered
+ natTag.selectFirstTag();
}
/*******************************************************************************
@@ -395,45 +380,20 @@
prevScreenState == NFA_SCREEN_STATE_OFF_UNLOCKED)) {
NFA_Deactivate(FALSE);
}
- if (isPeerToPeer(eventData->activated)) {
- if (sReaderModeEnabled) {
- LOG(DEBUG) << StringPrintf("%s: ignoring peer target in reader mode.",
- __func__);
- NFA_Deactivate(FALSE);
- break;
- }
- sP2pActive = true;
- LOG(DEBUG) << StringPrintf("%s: NFA_ACTIVATED_EVT; is p2p", __func__);
- if (NFC_GetNCIVersion() == NCI_VERSION_1_0) {
- // Disable RF field events in case of p2p
- uint8_t nfa_disable_rf_events[] = {0x00};
- LOG(DEBUG) << StringPrintf("%s: Disabling RF field events", __func__);
- status = NFA_SetConfig(NCI_PARAM_ID_RF_FIELD_INFO,
- sizeof(nfa_disable_rf_events),
- &nfa_disable_rf_events[0]);
- if (status == NFA_STATUS_OK) {
- LOG(DEBUG) << StringPrintf("%s: Disabled RF field events",
- __func__);
- } else {
- LOG(ERROR) << StringPrintf("%s: Failed to disable RF field events",
- __func__);
- }
- }
- } else {
- NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
- if (NfcTag::getInstance().getNumDiscNtf()) {
- /*If its multiprotocol tag, deactivate tag with current selected
- protocol to sleep . Select tag with next supported protocol after
- deactivation event is received*/
- NFA_Deactivate(true);
- }
- // We know it is not activating for P2P. If it activated in
- // listen mode then it is likely for an SE transaction.
- // Send the RF Event.
- if (isListenMode(eventData->activated)) {
- sSeRfActive = true;
- }
+ NfcTag::getInstance().connectionEventHandler(connEvent, eventData);
+ if (NfcTag::getInstance().getNumDiscNtf()) {
+ /*If its multiprotocol tag, deactivate tag with current selected
+ protocol to sleep . Select tag with next supported protocol after
+ deactivation event is received*/
+ NFA_Deactivate(true);
+ }
+
+ // If it activated in
+ // listen mode then it is likely for an SE transaction.
+ // Send the RF Event.
+ if (isListenMode(eventData->activated)) {
+ sSeRfActive = true;
}
} break;
case NFA_DEACTIVATED_EVT: // NFC link/protocol deactivated
@@ -463,30 +423,6 @@
(eventData->deactivated.type == NFA_DEACTIVATE_TYPE_DISCOVERY)) {
if (sSeRfActive) {
sSeRfActive = false;
- } else if (sP2pActive) {
- sP2pActive = false;
- // Make sure RF field events are re-enabled
- LOG(DEBUG) << StringPrintf("%s: NFA_DEACTIVATED_EVT; is p2p",
- __func__);
- if (NFC_GetNCIVersion() == NCI_VERSION_1_0) {
- // Disable RF field events in case of p2p
- uint8_t nfa_enable_rf_events[] = {0x01};
-
- if (!sIsDisabling && sIsNfaEnabled) {
- LOG(DEBUG) << StringPrintf("%s: Enabling RF field events",
- __func__);
- status = NFA_SetConfig(NCI_PARAM_ID_RF_FIELD_INFO,
- sizeof(nfa_enable_rf_events),
- &nfa_enable_rf_events[0]);
- if (status == NFA_STATUS_OK) {
- LOG(DEBUG) << StringPrintf("%s: Enabled RF field events",
- __func__);
- } else {
- LOG(ERROR) << StringPrintf(
- "%s: Failed to enable RF field events", __func__);
- }
- }
- }
}
}
@@ -748,7 +684,7 @@
LOG(DEBUG) << StringPrintf(
"%s: NFA_DM_RF_FIELD_EVT; status=0x%X; field status=%u", __func__,
eventData->rf_field.status, eventData->rf_field.rf_field_status);
- if (!sP2pActive && eventData->rf_field.status == NFA_STATUS_OK) {
+ if (eventData->rf_field.status == NFA_STATUS_OK) {
struct nfc_jni_native_data* nat = getNative(NULL, NULL);
if (!nat) {
LOG(ERROR) << StringPrintf("cached nat is null");
@@ -1352,7 +1288,7 @@
jboolean enable_lptd,
jboolean reader_mode,
jboolean enable_host_routing,
- jboolean enable_p2p, jboolean restart) {
+ jboolean restart) {
tNFA_TECHNOLOGY_MASK tech_mask = DEFAULT_TECH_MASK;
struct nfc_jni_native_data* nat = getNative(e, o);
@@ -1380,11 +1316,8 @@
stopPolling_rfDiscoveryDisabled();
startPolling_rfDiscoveryDisabled(tech_mask);
- // Start P2P listening if tag polling was enabled
if (sPollingEnabled) {
- LOG(DEBUG) << StringPrintf("%s: Enable p2pListening", __func__);
-
- if (reader_mode && !sReaderModeEnabled) {
+ if (reader_mode && !sReaderModeEnabled) {
sReaderModeEnabled = true;
NFA_DisableListening();
@@ -1518,7 +1451,6 @@
sDiscoveryEnabled = false;
sPollingEnabled = false;
sIsDisabling = false;
- sP2pEnabled = false;
sReaderModeEnabled = false;
gActivated = false;
sLfT3tMax = 0;
@@ -1538,19 +1470,6 @@
/*******************************************************************************
**
-** Function: isPeerToPeer
-**
-** Description: Whether the activation data indicates the peer supports
-*NFC-DEP.
-** activated: Activation data.
-**
-** Returns: True if the peer supports NFC-DEP.
-**
-*******************************************************************************/
-static bool isPeerToPeer(tNFA_ACTIVATED& activated) { return false; }
-
-/*******************************************************************************
-**
** Function: isListenMode
**
** Description: Indicates whether the activation data indicates it is
@@ -1802,7 +1721,7 @@
state == NFA_SCREEN_STATE_OFF_UNLOCKED) &&
(prevScreenState == NFA_SCREEN_STATE_ON_UNLOCKED ||
prevScreenState == NFA_SCREEN_STATE_ON_LOCKED) &&
- (!sP2pActive) && (!sSeRfActive)) {
+ (!sSeRfActive)) {
// screen turns off, disconnect tag if connected
nativeNfcTag_doDisconnect(NULL, NULL);
}
@@ -2129,7 +2048,7 @@
{"getLfT3tMax", "()I", (void*)nfcManager_getLfT3tMax},
- {"doEnableDiscovery", "(IZZZZZ)V", (void*)nfcManager_enableDiscovery},
+ {"doEnableDiscovery", "(IZZZZ)V", (void*)nfcManager_enableDiscovery},
{"doStartStopPolling", "(Z)V", (void*)nfcManager_doStartStopPolling},
diff --git a/nci/jni/NfcJniUtil.h b/nci/jni/NfcJniUtil.h
index e2b6559..b1bedfa 100644
--- a/nci/jni/NfcJniUtil.h
+++ b/nci/jni/NfcJniUtil.h
@@ -29,14 +29,7 @@
#define DISCOVERY_MODE_DISABLED 0
#define DISCOVERY_MODE_ENABLED 1
-#define MODE_P2P_TARGET 0
-#define MODE_P2P_INITIATOR 1
-
/* Properties values */
-#define PROPERTY_LLCP_LTO 0
-#define PROPERTY_LLCP_MIU 1
-#define PROPERTY_LLCP_WKS 2
-#define PROPERTY_LLCP_OPT 3
#define PROPERTY_NFC_DISCOVERY_A 4
#define PROPERTY_NFC_DISCOVERY_B 5
#define PROPERTY_NFC_DISCOVERY_F 6
@@ -116,12 +109,6 @@
/* Secure Element selected */
int seId;
- /* LLCP params */
- int lto;
- int miu;
- int wks;
- int opt;
-
int tech_mask;
int discovery_duration;
diff --git a/nci/jni/NfcTag.cpp b/nci/jni/NfcTag.cpp
index 821d5f6..77b915f 100755
--- a/nci/jni/NfcTag.cpp
+++ b/nci/jni/NfcTag.cpp
@@ -1022,73 +1022,6 @@
/*******************************************************************************
**
-** Function: isP2pDiscovered
-**
-** Description: Does the peer support P2P?
-**
-** Returns: True if the peer supports P2P.
-**
-*******************************************************************************/
-bool NfcTag::isP2pDiscovered() {
- static const char fn[] = "NfcTag::isP2pDiscovered";
- bool retval = false;
-
- for (int i = 0; i < mNumDiscTechList; i++) {
- if (mTechLibNfcTypesDiscData[i] == NFA_PROTOCOL_NFC_DEP) {
- // if remote device supports P2P
- LOG(DEBUG) << StringPrintf("%s: discovered P2P", fn);
- retval = true;
- break;
- }
- }
- LOG(DEBUG) << StringPrintf("%s: return=%u", fn, retval);
- return retval;
-}
-
-/*******************************************************************************
-**
-** Function: selectP2p
-**
-** Description: Select the preferred P2P technology if there is a choice.
-**
-** Returns: None
-**
-*******************************************************************************/
-void NfcTag::selectP2p() {
- static const char fn[] = "NfcTag::selectP2p";
- uint8_t rfDiscoveryId = 0;
-
- for (int i = 0; i < mNumTechList; i++) {
- // if remote device does not support P2P, just skip it
- if (mTechLibNfcTypes[i] != NFA_PROTOCOL_NFC_DEP) continue;
-
- // if remote device supports tech F;
- // tech F is preferred because it is faster than tech A
- if ((mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_F) ||
- (mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_F_ACTIVE)) {
- rfDiscoveryId = mTechHandles[i];
- break; // no need to search further
- } else if ((mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_A) ||
- (mTechParams[i].mode == NFC_DISCOVERY_TYPE_POLL_A_ACTIVE)) {
- // only choose tech A if tech F is unavailable
- if (rfDiscoveryId == 0) rfDiscoveryId = mTechHandles[i];
- }
- }
-
- if (rfDiscoveryId > 0) {
- LOG(DEBUG) << StringPrintf("%s: select P2P; target rf discov id=0x%X", fn,
- rfDiscoveryId);
- tNFA_STATUS stat =
- NFA_Select(rfDiscoveryId, NFA_PROTOCOL_NFC_DEP, NFA_INTERFACE_NFC_DEP);
- if (stat != NFA_STATUS_OK)
- LOG(ERROR) << StringPrintf("%s: fail select P2P; error=0x%X", fn, stat);
- } else
- LOG(ERROR) << StringPrintf("%s: cannot find P2P", fn);
- resetTechnologies();
-}
-
-/*******************************************************************************
-**
** Function: resetTechnologies
**
** Description: Clear all data related to the technology, protocol of the
diff --git a/nci/jni/NfcTag.h b/nci/jni/NfcTag.h
index 7a943a0..698db4c 100644
--- a/nci/jni/NfcTag.h
+++ b/nci/jni/NfcTag.h
@@ -162,28 +162,6 @@
/*******************************************************************************
**
- ** Function: isP2pDiscovered
- **
- ** Description: Does the peer support P2P?
- **
- ** Returns: True if the peer supports P2P.
- **
- *******************************************************************************/
- bool isP2pDiscovered();
-
- /*******************************************************************************
- **
- ** Function: selectP2p
- **
- ** Description: Select the preferred P2P technology if there is a choice.
- **
- ** Returns: None
- **
- *******************************************************************************/
- void selectP2p();
-
- /*******************************************************************************
- **
** Function: selectFirstTag
**
** Description: When multiple tags are discovered, just select the first
diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
index 67a1f56..67099d4 100755
--- a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -217,7 +217,6 @@
boolean enableLowPowerPolling,
boolean enableReaderMode,
boolean enableHostRouting,
- boolean enableP2p,
boolean restart);
@Override
@@ -227,7 +226,6 @@
params.shouldEnableLowPowerDiscovery(),
params.shouldEnableReaderMode(),
params.shouldEnableHostRouting(),
- params.shouldEnableP2p(),
restart);
}
diff --git a/src/com/android/nfc/DeviceHost.java b/src/com/android/nfc/DeviceHost.java
index b75fa9e..7ca13c8 100644
--- a/src/com/android/nfc/DeviceHost.java
+++ b/src/com/android/nfc/DeviceHost.java
@@ -96,15 +96,6 @@
}
public interface NfcDepEndpoint {
-
- /**
- * Peer-to-Peer Target
- */
- public static final short MODE_P2P_TARGET = 0x00;
- /**
- * Peer-to-Peer Initiator
- */
- public static final short MODE_P2P_INITIATOR = 0x01;
/**
* Invalid target mode
*/
diff --git a/src/com/android/nfc/NfcDiscoveryParameters.java b/src/com/android/nfc/NfcDiscoveryParameters.java
index 3226aa4..7de69ab 100644
--- a/src/com/android/nfc/NfcDiscoveryParameters.java
+++ b/src/com/android/nfc/NfcDiscoveryParameters.java
@@ -57,17 +57,7 @@
return this;
}
- public NfcDiscoveryParameters.Builder setEnableP2p(boolean enable) {
- mParameters.mEnableP2p = enable;
- return this;
- }
-
public NfcDiscoveryParameters build() {
- if (mParameters.mEnableReaderMode &&
- (mParameters.mEnableLowPowerDiscovery || mParameters.mEnableP2p)) {
- throw new IllegalStateException("Can't enable LPTD/P2P and reader mode " +
- "simultaneously");
- }
return mParameters;
}
}
@@ -79,7 +69,6 @@
private boolean mEnableLowPowerDiscovery = true;
private boolean mEnableReaderMode = false;
private boolean mEnableHostRouting = false;
- private boolean mEnableP2p = false;
public NfcDiscoveryParameters() {}
@@ -103,10 +92,6 @@
return mTechMask != 0 || mEnableHostRouting;
}
- public boolean shouldEnableP2p() {
- return mEnableP2p;
- }
-
@Override
public boolean equals(Object obj) {
if (obj == this) {
@@ -120,8 +105,7 @@
return mTechMask == params.mTechMask &&
(mEnableLowPowerDiscovery == params.mEnableLowPowerDiscovery) &&
(mEnableReaderMode == params.mEnableReaderMode) &&
- (mEnableHostRouting == params.mEnableHostRouting)
- && (mEnableP2p == params.mEnableP2p);
+ (mEnableHostRouting == params.mEnableHostRouting);
}
@Override
@@ -135,7 +119,6 @@
sb.append("mEnableLPD: " + Boolean.toString(mEnableLowPowerDiscovery) + "\n");
sb.append("mEnableReader: " + Boolean.toString(mEnableReaderMode) + "\n");
sb.append("mEnableHostRouting: " + Boolean.toString(mEnableHostRouting) + "\n");
- sb.append("mEnableP2p: " + Boolean.toString(mEnableP2p));
return sb.toString();
}
@@ -145,7 +128,6 @@
proto.write(DiscoveryParamsProto.ENABLE_LPD, mEnableLowPowerDiscovery);
proto.write(DiscoveryParamsProto.ENABLE_READER, mEnableReaderMode);
proto.write(DiscoveryParamsProto.ENABLE_HOST_ROUTING, mEnableHostRouting);
- proto.write(DiscoveryParamsProto.ENABLE_P2P, mEnableP2p);
}
public static NfcDiscoveryParameters.Builder newBuilder() {
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 0a913f3..6e322e5 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -2872,12 +2872,9 @@
}
} else {
paramsBuilder.setTechMask(NfcDiscoveryParameters.NFC_POLL_DEFAULT);
- paramsBuilder.setEnableP2p(false);
}
} else if (screenState == ScreenStateHelper.SCREEN_STATE_ON_LOCKED && mInProvisionMode) {
paramsBuilder.setTechMask(NfcDiscoveryParameters.NFC_POLL_DEFAULT);
- // enable P2P for MFM/EDU/Corp provisioning
- paramsBuilder.setEnableP2p(false);
} else if (screenState == ScreenStateHelper.SCREEN_STATE_ON_LOCKED &&
mNfcUnlockManager.isLockscreenPollingEnabled() && isReaderOptionEnabled()) {
int techMask = 0;
@@ -2885,7 +2882,6 @@
techMask |= mNfcUnlockManager.getLockscreenPollMask();
paramsBuilder.setTechMask(techMask);
paramsBuilder.setEnableLowPowerDiscovery(false);
- paramsBuilder.setEnableP2p(false);
}
if (mIsHceCapable && mReaderModeParams == null) {
@@ -2936,16 +2932,6 @@
// Disconnect from tags
TagEndpoint tag = (TagEndpoint) o;
tag.disconnect();
- } else if (o instanceof NfcDepEndpoint) {
- // Disconnect from P2P devices
- NfcDepEndpoint device = (NfcDepEndpoint) o;
- if (device.getMode() == NfcDepEndpoint.MODE_P2P_TARGET) {
- // Remote peer is target, request disconnection
- device.disconnect();
- } else {
- // Remote peer is initiator, we cannot disconnect
- // Just wait for field removal
- }
}
}
}
diff --git a/src/com/android/nfc/ScreenStateHelper.java b/src/com/android/nfc/ScreenStateHelper.java
index bbfecd1..7efeb7f 100644
--- a/src/com/android/nfc/ScreenStateHelper.java
+++ b/src/com/android/nfc/ScreenStateHelper.java
@@ -17,7 +17,6 @@
//Polling mask
static final int SCREEN_POLLING_TAG_MASK = 0x10;
- static final int SCREEN_POLLING_P2P_MASK = 0x20;
static final int SCREEN_POLLING_READER_MASK = 0x40;
private final PowerManager mPowerManager;
diff --git a/src/com/android/nfc/cardemulation/AidRoutingManager.java b/src/com/android/nfc/cardemulation/AidRoutingManager.java
index 67adb8b..11babac 100644
--- a/src/com/android/nfc/cardemulation/AidRoutingManager.java
+++ b/src/com/android/nfc/cardemulation/AidRoutingManager.java
@@ -556,4 +556,9 @@
}
}
}
+
+ @VisibleForTesting
+ public boolean isRoutingTableCleared() {
+ return mAidRoutingTable.size() == 0 && mRouteForAid.isEmpty() && mPowerForAid.isEmpty();
+ }
}
diff --git a/tests/unit/src/com/android/nfc/AidRoutingManagerTest.java b/tests/unit/src/com/android/nfc/AidRoutingManagerTest.java
index 9bac0e6..98813e2 100644
--- a/tests/unit/src/com/android/nfc/AidRoutingManagerTest.java
+++ b/tests/unit/src/com/android/nfc/AidRoutingManagerTest.java
@@ -88,4 +88,29 @@
size = mAidRoutingManager.calculateAidRouteSize(aidEntryMap);
Assert.assertEquals(6, size);
}
-}
+
+ @Test
+ public void testOnNfccRoutingTableCleared() {
+ if (!mNfcSupported) return;
+
+ mAidRoutingManager.onNfccRoutingTableCleared();
+ boolean isTableCleared = mAidRoutingManager.isRoutingTableCleared();
+ Assert.assertTrue(isTableCleared);
+ }
+
+ @Test
+ public void testSupportsAidPrefixRouting() {
+ if (!mNfcSupported) return;
+
+ boolean isSupportPrefixRouting = mAidRoutingManager.supportsAidPrefixRouting();
+ Assert.assertFalse(isSupportPrefixRouting);
+ }
+
+ @Test
+ public void testSupportsAidSubsetRouting() {
+ if (!mNfcSupported) return;
+
+ boolean isSupportSubsetRouting = mAidRoutingManager.supportsAidSubsetRouting();
+ Assert.assertFalse(isSupportSubsetRouting);
+ }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/nfc/NfcDiscoveryParametersTest.java b/tests/unit/src/com/android/nfc/NfcDiscoveryParametersTest.java
index ce2709a..1bd20b3 100644
--- a/tests/unit/src/com/android/nfc/NfcDiscoveryParametersTest.java
+++ b/tests/unit/src/com/android/nfc/NfcDiscoveryParametersTest.java
@@ -60,17 +60,13 @@
}
- private NfcDiscoveryParameters computeDiscoveryParameters(boolean isP2pEnable) {
+ private NfcDiscoveryParameters computeDiscoveryParameters() {
// Recompute discovery parameters based on screen state
NfcDiscoveryParameters.Builder paramsBuilder = NfcDiscoveryParameters.newBuilder();
paramsBuilder.setTechMask(1);
paramsBuilder.setEnableLowPowerDiscovery(true);
paramsBuilder.setEnableHostRouting(true);
- if (isP2pEnable) {
- paramsBuilder.setEnableP2p(true);
- } else {
- paramsBuilder.setEnableReaderMode(true);
- }
+ paramsBuilder.setEnableReaderMode(true);
return paramsBuilder.build();
}
@@ -78,21 +74,12 @@
public void testGetTechMask() {
if (!mNfcSupported) return;
- NfcDiscoveryParameters nfcDiscoveryParameters = computeDiscoveryParameters(false);
+ NfcDiscoveryParameters nfcDiscoveryParameters = computeDiscoveryParameters();
int techMask = nfcDiscoveryParameters.getTechMask();
Assert.assertEquals(1, techMask);
}
@Test
- public void testShouldEnableP2p() {
- if (!mNfcSupported) return;
-
- NfcDiscoveryParameters nfcDiscoveryParameters = computeDiscoveryParameters(false);
- boolean shouldP2pEnable = nfcDiscoveryParameters.shouldEnableP2p();
- Assert.assertFalse(shouldP2pEnable);
- }
-
- @Test
public void testDiscoveryParameters() {
if (!mNfcSupported) return;
@@ -109,7 +96,7 @@
Assert.assertFalse(shouldEnableReaderMode);
Assert.assertFalse(shouldEnableHostRouting);
- nfcDiscoveryParameters = computeDiscoveryParameters(false);
+ nfcDiscoveryParameters = computeDiscoveryParameters();
shouldEnableDiscovery = nfcDiscoveryParameters.shouldEnableDiscovery();
shouldEnableLowPowerDiscovery = nfcDiscoveryParameters.shouldEnableLowPowerDiscovery();
shouldEnableReaderMode = nfcDiscoveryParameters.shouldEnableReaderMode();
