commit 3e84bebc0e1be12393c2ae0330ae16abae581d5e
author Keun Soo Yim <yim@google.com> Fri Jan 20 01:23:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 01:23:19 2017 +0000
tree 9a33563533e108247a4653228fdeac54ce243af3
parent f2101feb7212da459723d539f138fb0eb0ce4873
parent 706c3e97d4561373722a39f31c2daf4d93a4ffb6

Merge "use the default binder/passthrough mode in NFC VTS test." am: 5c959c69dc am: 83c6380571 am: d38100efd2
am: 706c3e97d4

Change-Id: Id709cde285ef0a02b402b8581c1e62ec9a3849ea

nfc/1.0/vts/functional/nfc_hidl_hal_test.cpp

diff --git a/nfc/1.0/vts/functional/nfc_hidl_hal_test.cpp b/nfc/1.0/vts/functional/nfc_hidl_hal_test.cpp
index 521f17f..a50d88f 100644
--- a/nfc/1.0/vts/functional/nfc_hidl_hal_test.cpp
+++ b/nfc/1.0/vts/functional/nfc_hidl_hal_test.cpp
@@ -53,13 +53,11 @@
 #define VERSION 0x11
 #define TIMEOUT_PERIOD 5
 
-static bool passthrough = true;
-
 // The main test class for NFC HIDL HAL.
 class NfcHidlTest : public ::testing::Test {
  public:
   virtual void SetUp() override {
-    nfc_ = INfc::getService(passthrough);
+    nfc_ = INfc::getService();
     ASSERT_NE(nfc_, nullptr);
 
     nfc_cb_ = new NfcClientCallback(*this);
@@ -336,12 +334,6 @@
   ::testing::AddGlobalTestEnvironment(new NfcHidlEnvironment);
   ::testing::InitGoogleTest(&argc, argv);
 
-  for (int i = 0; i < argc; i++) {
-    if (strstr(argv[i], "passthrough=false") != nullptr) {
-      passthrough = false;
-      break;
-    }
-  }
   std::system("svc nfc disable"); /* Turn off NFC */
   sleep(5);