Merge the 2019-08-01 SPL branch from AOSP-Partner
* security-aosp-nyc-mr2-release:
[DO NOT MERGE]Prevent OOB Read in Mfc_Transceive
[DO NOT MERGE]Prevent OOB write in Mfc_Transceive
Prevent OOB write in phFriNfc_ExtnsTransceive
Change-Id: I6410d3b7c2a6e6cbb71ae00ceef5229304489f39
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 0c36868..2c0e7c7 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1,4 +1,7 @@
/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Not a Contribution.
+ *
* Copyright (C) 2010 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -742,6 +745,13 @@
}
final class NfcAdapterService extends INfcAdapter.Stub {
+ /**
+ * An interface for vendor specific extensions
+ */
+ public IBinder getNfcAdapterVendorInterface(String vendor) {
+ return null;
+ }
+
@Override
public boolean enable() throws RemoteException {
NfcPermissions.enforceAdminPermissions(mContext);