commit 0626e0e62945e8050efd693dc7f98d12732450c2
author nxf50051 <dinesh.ambati@nxp.com> Fri Feb 08 14:57:00 2019 +0530
committer nxf24591 <nanjesh.s_1@nxp.com> Thu Mar 28 12:48:42 2019 +0530
tree b28e4a12659cbb5532e4e9fb09d13f3deebab300
parent 1d50f9e57683c429c8cdf65c5b1d6e394350a525

Support for dynamic selection for config file

Some of the config paramters are not getting updated even after Nfc
On/Off, Refreshing config paramters before configuring routing table.

src/com/android/nfc/cardemulation/AidRoutingManager.java

diff --git a/src/com/android/nfc/cardemulation/AidRoutingManager.java b/src/com/android/nfc/cardemulation/AidRoutingManager.java
index d63d644..5eb1e3b 100644
--- a/src/com/android/nfc/cardemulation/AidRoutingManager.java
+++ b/src/com/android/nfc/cardemulation/AidRoutingManager.java
@@ -87,12 +87,12 @@
     // For Nexus devices, just a static route to the eSE
     // OEMs/Carriers could manually map off-host AIDs
     // to the correct eSE/UICC based on state they keep.
-    final int mDefaultOffHostRoute;
+    int mDefaultOffHostRoute;
 
     // How the NFC controller can match AIDs in the routing table;
     // see AID_MATCHING constants
-    final int mAidMatchingSupport;
-    final int mAidMatchingPlatform;
+    int mAidMatchingSupport;
+    int mAidMatchingPlatform;
     //Changed from final to private int to update RoutingtableSize later in configureRouting.
     private int mAidRoutingTableSize;
     // Maximum AID routing table size
@@ -132,7 +132,7 @@
         mAidMatchingSupport = doGetAidMatchingMode();
         if (DBG) Log.d(TAG, "mAidMatchingSupport=0x" + Integer.toHexString(mAidMatchingSupport));
         mAidMatchingPlatform = doGetAidMatchingPlatform();
-        if (DBG) Log.d(TAG, "mAidTableSize=0x" + Integer.toHexString(mAidRoutingTableSize));
+        if (DBG) Log.d(TAG, "mAidMatchingPlatform=0x" + Integer.toHexString(mAidMatchingPlatform));
         mVzwRoutingCache = new VzwRoutingCache();
         mLastCommitStatus = true;
 
@@ -205,8 +205,23 @@
         return true;
     }
 
+    public void refreshConfigParameters() {
+      mDefaultRoute = doGetDefaultRouteDestination();
+      if (DBG)
+        Log.d(TAG, "mDefaultRoute=0x" + Integer.toHexString(mDefaultRoute));
+      mDefaultOffHostRoute = doGetDefaultOffHostRouteDestination();
+      if (DBG)
+        Log.d(TAG, "mDefaultOffHostRoute=0x" + Integer.toHexString(mDefaultOffHostRoute));
+      mAidMatchingSupport = doGetAidMatchingMode();
+      if (DBG)
+        Log.d(TAG, "mAidMatchingSupport=0x" + Integer.toHexString(mAidMatchingSupport));
+      mAidMatchingPlatform = doGetAidMatchingPlatform();
+    }
+
     public boolean configureRouting(HashMap<String, AidElement> aidMap) {
         mRoutingTableChanged = false;
+        //To handle Dynamic change in config files.
+        refreshConfigParameters();
         mDefaultRoute = NfcService.getInstance().GetDefaultRouteLoc();
         boolean aidRouteResolved = false;
         if (DBG) Log.d(TAG, "mAidMatchingPlatform=0x" + Integer.toHexString(mAidMatchingPlatform));