commit eed0a7bf45bf530ced0669d360482a9f3ca5fc32
author Tucker Sylvestro <tuckeris@google.com> Wed Jan 18 16:34:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 16:34:50 2017 +0000
tree 13c6bd19941b06f7d152715118874cdd49f45848
parent 13f18efb8f4e6c7adf911719c34a5d33acb956ae
parent 1876583bfbf5ec5f17fedb650eb82c3f52ff4a8f

svc nfc should support watches too
am: 1876583bfb

Change-Id: Ic3f0277c2c13dbd2c4f8b6ec5dbe9f9dc34ef297

cmds/svc/src/com/android/commands/svc/NfcCommand.java

diff --git a/cmds/svc/src/com/android/commands/svc/NfcCommand.java b/cmds/svc/src/com/android/commands/svc/NfcCommand.java
index 8e9791f..02a92b9 100644
--- a/cmds/svc/src/com/android/commands/svc/NfcCommand.java
+++ b/cmds/svc/src/com/android/commands/svc/NfcCommand.java
@@ -58,7 +58,8 @@
                 IPackageManager pm = IPackageManager.Stub.asInterface(
                         ServiceManager.getService("package"));
                 try {
-                    if (pm.hasSystemFeature(PackageManager.FEATURE_NFC, 0)) {
+                    if (pm.hasSystemFeature(PackageManager.FEATURE_NFC, 0) ||
+			pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION, 0)) {
                         INfcAdapter nfc = INfcAdapter.Stub
                                 .asInterface(ServiceManager.getService(Context.NFC_SERVICE));
                         try {