Merge "Code cleanup: removed support of P2P in NfcDiscoveryParameters" into main

4 files changed, 3 insertions, 27 deletions

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 118b978d..c5478d8e 100644
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -1296,7 +1296,7 @@ static void nfcManager_enableDiscovery(JNIEnv* e, jobject o,
                                        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);
 
@@ -2056,7 +2056,7 @@ static JNINativeMethod gMethods[] = {
 
     {"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/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
index 67a1f567..67099d47 100755
--- a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -217,7 +217,6 @@ public class NativeNfcManager implements DeviceHost {
             boolean enableLowPowerPolling,
             boolean enableReaderMode,
             boolean enableHostRouting,
-            boolean enableP2p,
             boolean restart);
 
     @Override
@@ -227,7 +226,6 @@ public class NativeNfcManager implements DeviceHost {
                 params.shouldEnableLowPowerDiscovery(),
                 params.shouldEnableReaderMode(),
                 params.shouldEnableHostRouting(),
-                params.shouldEnableP2p(),
                 restart);
     }
 
diff --git a/src/com/android/nfc/NfcDiscoveryParameters.java b/src/com/android/nfc/NfcDiscoveryParameters.java
index 3226aa4b..7de69abd 100644
--- a/src/com/android/nfc/NfcDiscoveryParameters.java
+++ b/src/com/android/nfc/NfcDiscoveryParameters.java
@@ -57,17 +57,7 @@ public final class NfcDiscoveryParameters {
             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 @@ public final class NfcDiscoveryParameters {
     private boolean mEnableLowPowerDiscovery = true;
     private boolean mEnableReaderMode = false;
     private boolean mEnableHostRouting = false;
-    private boolean mEnableP2p = false;
 
     public NfcDiscoveryParameters() {}
 
@@ -103,10 +92,6 @@ public final class NfcDiscoveryParameters {
         return mTechMask != 0 || mEnableHostRouting;
     }
 
-    public boolean shouldEnableP2p() {
-        return mEnableP2p;
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == this) {
@@ -120,8 +105,7 @@ public final class NfcDiscoveryParameters {
         return mTechMask == params.mTechMask &&
                 (mEnableLowPowerDiscovery == params.mEnableLowPowerDiscovery) &&
                 (mEnableReaderMode == params.mEnableReaderMode) &&
-                (mEnableHostRouting == params.mEnableHostRouting)
-                && (mEnableP2p == params.mEnableP2p);
+                (mEnableHostRouting == params.mEnableHostRouting);
     }
 
     @Override
@@ -135,7 +119,6 @@ public final class NfcDiscoveryParameters {
         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 @@ public final class NfcDiscoveryParameters {
         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 be3c3ec7..6e322e57 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -2872,12 +2872,9 @@ public class NfcService implements DeviceHostListener, ForegroundUtils.Callback
                 }
             } 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 @@ public class NfcService implements DeviceHostListener, ForegroundUtils.Callback
                 techMask |= mNfcUnlockManager.getLockscreenPollMask();
             paramsBuilder.setTechMask(techMask);
             paramsBuilder.setEnableLowPowerDiscovery(false);
-            paramsBuilder.setEnableP2p(false);
         }
 
         if (mIsHceCapable && mReaderModeParams == null) {