diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-16 18:58:14 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-16 18:58:14 +0000 |
| commit | d6afaec61a6a4114d0f89f72d2b7404376061595 (patch) | |
| tree | 563d31cbf6b649b96227eb23211d01125face68b | |
| parent | 1a7ca2f8c750c84c17bf3fd6e97810b7cee176ba (diff) | |
| parent | 35f34c2a18a09660e63cd509a2c37eee70893b67 (diff) | |
| download | android_hardware_nxp_nfc-d6afaec61a6a4114d0f89f72d2b7404376061595.tar.gz android_hardware_nxp_nfc-d6afaec61a6a4114d0f89f72d2b7404376061595.tar.bz2 android_hardware_nxp_nfc-d6afaec61a6a4114d0f89f72d2b7404376061595.zip | |
Merge cherrypicks of [6072697, 6072075, 6072758, 6072124, 6072885, 6072886, 6072887, 6072580, 6072581, 6072582, 6072583, 6072584, 6072132, 6072195, 6072133, 6072077, 6072134, 6072078, 6072211, 6072762, 6072763, 6072908, 6072909, 6072910, 6072911, 6072912, 6072913, 6072914, 6072930, 6072212, 6072743] into pi-qpr2-release
Change-Id: I60ab03dbcb39de7c6f7e959ff063088868e8898e
| -rwxr-xr-x | halimpl/hal/phNxpNciHal_ext.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/halimpl/hal/phNxpNciHal_ext.cc b/halimpl/hal/phNxpNciHal_ext.cc index 646a07b..bc3f7ec 100755 --- a/halimpl/hal/phNxpNciHal_ext.cc +++ b/halimpl/hal/phNxpNciHal_ext.cc @@ -12,8 +12,8 @@ * 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. - */#include <log/log.h> - + */ +#include <log/log.h> #include <phDal4Nfc_messageQueueLib.h> #include <phNxpConfig.h> #include <phNxpLog.h> @@ -98,6 +98,15 @@ void phNxpNciHal_ext_init(void) { NFCSTATUS phNxpNciHal_process_ext_rsp(uint8_t* p_ntf, uint16_t* p_len) { NFCSTATUS status = NFCSTATUS_SUCCESS; + if (p_ntf[0] == 0x61 && p_ntf[1] == 0x05 && *p_len < 14) { + if(*p_len <= 6) { + android_errorWriteLog(0x534e4554, "118152591"); + } + NXPLOG_NCIHAL_E("RF_INTF_ACTIVATED_NTF length error!"); + status = NFCSTATUS_FAILED; + return status; + } + if (p_ntf[0] == 0x61 && p_ntf[1] == 0x05 && p_ntf[4] == 0x03 && p_ntf[5] == 0x05 && nxpprofile_ctrl.profile_type == EMV_CO_PROFILE) { p_ntf[4] = 0xFF; |