diff options
author | Andres Morales <anmorales@google.com> | 2014-11-24 08:16:47 -0800 |
---|---|---|
committer | Andres Morales <anmorales@google.com> | 2014-11-24 08:19:06 -0800 |
commit | 06c7bbee7c48293406e19e79d28616908c56a45e (patch) | |
tree | fd25fce2a2f679497385fb6a6dc070c4b15ba428 | |
parent | 8a80bc7b9b873290a57b938eaa01a3156d0de861 (diff) | |
download | android_packages_apps_Nfc-06c7bbee7c48293406e19e79d28616908c56a45e.tar.gz android_packages_apps_Nfc-06c7bbee7c48293406e19e79d28616908c56a45e.tar.bz2 android_packages_apps_Nfc-06c7bbee7c48293406e19e79d28616908c56a45e.zip |
Fix NfcDiscoveryParameters
Added a new field without adding it to .equals().
Leads to P2P not getting enabled in SW.
Bug: 18501664
Change-Id: I602045cbbd84a87edff5b82a3c0db96c9159e21f
-rw-r--r-- | src/com/android/nfc/NfcDiscoveryParameters.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcDiscoveryParameters.java b/src/com/android/nfc/NfcDiscoveryParameters.java index a71ad949..1149836d 100644 --- a/src/com/android/nfc/NfcDiscoveryParameters.java +++ b/src/com/android/nfc/NfcDiscoveryParameters.java @@ -72,6 +72,7 @@ public final class NfcDiscoveryParameters { static final int NFC_POLL_DEFAULT = -1; + // NOTE: when adding a new field, don't forget to update equals() and toString() below private int mTechMask = 0; private boolean mEnableLowPowerDiscovery = true; private boolean mEnableReaderMode = false; @@ -117,7 +118,8 @@ public final class NfcDiscoveryParameters { return mTechMask == params.mTechMask && (mEnableLowPowerDiscovery == params.mEnableLowPowerDiscovery) && (mEnableReaderMode == params.mEnableReaderMode) && - (mEnableHostRouting == params.mEnableHostRouting); + (mEnableHostRouting == params.mEnableHostRouting) + && (mEnableP2p == params.mEnableP2p); } @Override @@ -130,7 +132,8 @@ public final class NfcDiscoveryParameters { } sb.append("mEnableLPD: " + Boolean.toString(mEnableLowPowerDiscovery) + "\n"); sb.append("mEnableReader: " + Boolean.toString(mEnableReaderMode) + "\n"); - sb.append("mEnableHostRouting: " + Boolean.toString(mEnableHostRouting)); + sb.append("mEnableHostRouting: " + Boolean.toString(mEnableHostRouting) + "\n"); + sb.append("mEnableP2p: " + Boolean.toString(mEnableP2p)); return sb.toString(); } |