commit fc3ccc5a40031a274aae68572f320f6b1517fc84
author Jackeagle <jackeagle102@gmail.com> Tue Oct 05 03:45:24 2021 -0400
committer Jackeagle <jackeagle102@gmail.com> Tue Oct 05 03:45:24 2021 -0400
tree 38516809a433cb8f6bd260936bfbe2d85334dcd6
parent 119d78820e69d41371eb5cc1cb73062202b7d03b
parent 293a7fc35a8249dbe8cfa68fcf8c22d50b4e8345

Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/platform//packages/apps/Nfc into r

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I722179af885368a0bb304d55fddb1c6be4703c4a

src/com/android/nfc/NfcRootActivity.java

diff --git a/src/com/android/nfc/NfcRootActivity.java b/src/com/android/nfc/NfcRootActivity.java
index cc216f2..b0b340f 100644
--- a/src/com/android/nfc/NfcRootActivity.java
+++ b/src/com/android/nfc/NfcRootActivity.java
@@ -37,6 +37,7 @@
                 try {
                     startActivityAsUser(launchIntent, UserHandle.CURRENT);
                 } catch (ActivityNotFoundException e) {
+                } catch (SecurityException e) {
                 }
             }
         }

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 837940c..e4ce886 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1,4 +1,7 @@
 /*
+ * Copyright (c) 2018, 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");
@@ -914,6 +917,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);