Merge "NfcAdapterExtras: expose driver name." into jb-mr1-dev

core/java/android/nfc/INfcAdapterExtras.aidl

@@ -29,4 +29,5 @@ interface INfcAdapterExtras {
     int getCardEmulationRoute(in String pkg);
     void setCardEmulationRoute(in String pkg, int route);
     void authenticate(in String pkg, in byte[] token);
+    String getDriverName(in String pkg);
 }

nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java

@@ -234,4 +234,21 @@ public final class NfcAdapterExtras {
             attemptDeadServiceRecovery(e);
         }
     }
+
+    /**
+     * Returns the name of this adapter's driver.
+     *
+     * <p>Different NFC adapters may use different drivers.  This value is
+     * informational and should not be parsed.
+     *
+     * @return the driver name, or empty string if unknown
+     */
+    public String getDriverName() {
+        try {
+            return sService.getDriverName(mPackageName);
+        } catch (RemoteException e) {
+            attemptDeadServiceRecovery(e);
+            return "";
+        }
+    }
 }