[build/android] Ensure NFC remains disabled

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 270 matching lines @@
     device_settings.ConfigureContentSettings(
         device, device_settings.DISABLE_MOCK_LOCATION_SETTINGS)
   else:
     device_settings.ConfigureContentSettings(
         device, device_settings.ENABLE_MOCK_LOCATION_SETTINGS)
 
   device_settings.SetLockScreenSettings(device)
   if options.disable_network:
     device_settings.ConfigureContentSettings(
         device, device_settings.NETWORK_DISABLED_SETTINGS)
+    if device.build_version_sdk >= version_codes.MARSHMALLOW:
+      # Ensure that NFC is also switched off.
+      device.RunShellCommand(['svc', 'nfc', 'disable'],
+                             as_root=True, check_return=True)
 
   if options.disable_system_chrome:
     # The system chrome version on the device interferes with some tests.
     device.RunShellCommand(['pm', 'disable', 'com.android.chrome'],
                            check_return=True)
 
   if options.remove_system_webview:
     if any(device.PathExists(p) for p in _SYSTEM_WEBVIEW_PATHS):
       logging.info('System WebView exists and needs to be removed')
       if device.HasRoot():
@@ skipping 245 matching lines @@
   devil_chromium.Initialize(adb_path=args.adb_path)
 
   try:
     return ProvisionDevices(args)
   except (device_errors.DeviceUnreachableError, device_errors.NoDevicesError):
     return exit_codes.INFRA
 
 
 if __name__ == '__main__':
   sys.exit(main())