Reinstate RF field events.

These are generic enough to maintain in AOSP,
and can still be protected by nfcee_access.xml
like they used to be.

Bug: 16653617
Change-Id: Id604fcc45d4263b24fea2f16ca6a24e25f8580c3

2 files changed, 18 insertions, 0 deletions

diff --git a/nxp/jni/com_android_nfc_NativeNfcManager.cpp b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
index 489a615b..c80141e6 100644
--- a/nxp/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
@@ -50,6 +50,8 @@ static jmethodID cached_NfcManager_notifyLlcpLinkActivation;
 static jmethodID cached_NfcManager_notifyLlcpLinkDeactivated;
 static jmethodID cached_NfcManager_notifyTargetDeselected;
 
+static jmethodID cached_NfcManager_notifyRfFieldActivated;
+static jmethodID cached_NfcManager_notifyRfFieldDeactivated;
 namespace android {
 
 phLibNfc_Handle     storedHandle = 0;
@@ -1169,11 +1171,13 @@ static void nfc_jni_transaction_callback(void *context,
             case phLibNfc_eSE_EvtFieldOn:
             {
                 TRACE("> SE EVT_FIELD_ON");
+                e->CallVoidMethod(nat->manager, cached_NfcManager_notifyRfFieldActivated);
             }break;
 
             case phLibNfc_eSE_EvtFieldOff:
             {
                 TRACE("> SE EVT_FIELD_OFF");
+                e->CallVoidMethod(nat->manager, cached_NfcManager_notifyRfFieldDeactivated);
             }break;
 
             default:
@@ -1605,6 +1609,12 @@ static jboolean com_android_nfc_NfcManager_init_native_struc(JNIEnv *e, jobject
    cached_NfcManager_notifyLlcpLinkDeactivated = e->GetMethodID(cls,
       "notifyLlcpLinkDeactivated","(Lcom/android/nfc/dhimpl/NativeP2pDevice;)V");
 
+   cached_NfcManager_notifyRfFieldActivated = e->GetMethodID(cls,
+      "notifyRfFieldActivated", "()V");
+
+   cached_NfcManager_notifyRfFieldDeactivated = e->GetMethodID(cls,
+      "notifyRfFieldDeactivated", "()V");
+
    if(nfc_jni_cache_object(e,"com/android/nfc/dhimpl/NativeNfcTag",&(nat->cached_NfcTag)) == -1)
    {
       ALOGD("Native Structure initialization failed");
diff --git a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
index 18336233..cc73db3b 100755
--- a/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/nxp/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -373,4 +373,12 @@ public class NativeNfcManager implements DeviceHost {
     private void notifyLlcpLinkDeactivated(NativeP2pDevice device) {
         mListener.onLlcpLinkDeactivated(device);
     }
+
+    private void notifyRfFieldActivated() {
+        mListener.onRemoteFieldActivated();
+    }
+
+    private void notifyRfFieldDeactivated() {
+        mListener.onRemoteFieldDeactivated();
+    }
 }