Adding MiFARE DESFire format supportcm-11.0-XNPH44S-bacon-5fa8c79c0b

Fix semantic error when deregister P2P if discovery has started

This patch is to disable discovery before deregister P2P and re-enable discovery after that.

Code inspection fixes

Remove unused class memeber and avoid variable uninitialized.

Change-Id: I2da3a37c98de3e4f36cfcd1061d060ef14f4e00a
(cherry picked from commit 38be878b6f068634ea53ab6ccf6b336acd42ec97)

1 files changed, 29 insertions, 1 deletions

diff --git a/nci/jni/NfcTag.h b/nci/jni/NfcTag.h
index 6fc87bad..de15bd1f 100755
--- a/nci/jni/NfcTag.h
+++ b/nci/jni/NfcTag.h
@@ -13,7 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+/******************************************************************************
+ *
+ *  The original Work has been changed by NXP Semiconductors.
+ *
+ *  Copyright (C) 2013-2014 NXP Semiconductors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ ******************************************************************************/
 /*
  *  Tag-reading, tag-writing operations.
  */
@@ -219,6 +237,16 @@ public:
     *******************************************************************************/
     bool isMifareUltralight ();
 
+    /*******************************************************************************
+    **
+    ** Function:        isMifareDESFire
+    **
+    ** Description:     Whether the currently activated tag is Mifare Ultralight.
+    **
+    ** Returns:         True if tag is Mifare Ultralight.
+    **
+    *******************************************************************************/
+    bool isMifareDESFire ();
 
     /*******************************************************************************
     **