diff options
| author | Tucker Sylvestro <tuckeris@google.com> | 2016-12-14 14:01:14 -0500 |
|---|---|---|
| committer | Tucker Sylvestro <tuckeris@google.com> | 2017-01-18 10:27:38 -0500 |
| commit | 1876583bfbf5ec5f17fedb650eb82c3f52ff4a8f (patch) | |
| tree | 7f3e0a41bebf13166b36f1bd5bcf5987876afe4e /cmds/svc/src | |
| parent | df459cb2eac35ee3e819c519e372dcb6e3a035bb (diff) | |
svc nfc should support watches too
Check for both FEATURE_NFC and FEATURE_NFC_HOST_CARD_EMULATION in the
"svc nfc" command. Watches may only have the latter, but should still
support the nfc enable/disable command.
See b/24532713#comment7 for context.
Bug 32386425
Change-Id: I307798f00728c6b437aebfcf58115af7265e3692
Diffstat (limited to 'cmds/svc/src')
| -rw-r--r-- | cmds/svc/src/com/android/commands/svc/NfcCommand.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/svc/src/com/android/commands/svc/NfcCommand.java b/cmds/svc/src/com/android/commands/svc/NfcCommand.java index 8e9791f8b731..02a92b9c19ff 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 @@ public class NfcCommand extends Svc.Command { 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 { |