Merge branch 'cm-13.0' of https://github.com/LineageOS/android_packages_apps_Nfc into mm6.0mm6.0

9 files changed, 165 insertions, 65 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 942a9f07..7dd33798 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -135,7 +135,5 @@
 
         <service android:name=".handover.PeripheralHandoverService"
         />
-
-        <service android:name=".NfcBootstrapService" exported="true" />
     </application>
 </manifest>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 2a02fa06..e2693cfa 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -4,25 +4,13 @@
   <string name="app_name">Serviciu Nfc</string>
   <string name="nfcUserLabel">Nfc</string>
   <!-- A notification description string informing the user that contact details were received over NFC [CHAR-LIMIT=64] -->
-  <string name="inbound_me_profile_title">Contautu recibíu per NFC</string>
   <!-- A notification action string prompting the user to add contact details to the People application [CHAR-LIMIT=64] -->
   <string name="inbound_me_profile_text">Toca p\'amestar a esta persona como contautu.</string>
   <!-- A notification description string asking the user to share their contact details over NFC [CHAR-LIMIT=64] -->
-  <string name="outbound_me_profile_title">Interaición de NFC completa</string>
   <!-- A notification action string prompting the user to share their contact details over NFC [CHAR-LIMIT=64] -->
-  <string name="outbound_me_profile_text">Toca pa compartir la to información de contautu con esta persona.</string>
   <!-- Content description of the NFC enabled notification icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_nfc_enabled">NFC habilitada.</string>
-  <string name="touch">Toca pa compartir</string>
-  <string name="beam_progress">Tresferencia entrante...</string>
-  <string name="beam_outgoing">Compartiendo...</string>
-  <string name="beam_complete">Tresferencia completada</string>
-  <string name="beam_failed">Nun se completó la tresferencia</string>
-  <string name="beam_canceled">Tresferencia encaboxada</string>
   <string name="cancel">Encaboxar</string>
   <string name="beam_touch_to_view">Toca pa ver</string>
-  <string name="beam_handover_not_supported">El preséu del receptor nun almite la tresferencia de ficheros grandes.</string>
-  <string name="beam_try_again">Vuelvi a xuntar los preseos</string>
   <!-- String referring to the device being connected when there is no name for the device -->
   <!-- Toast string informing the user that the device is connecting [CHAR_LIMIT=35] -->
   <!-- Toast string informing the user that the device is connected [CHAR_LIMIT=35] -->
@@ -32,20 +20,17 @@
   <!-- Toast string informing the user that the device is pairing [CHAR_LIMIT=35] -->
   <!-- Toast string informing the user that the device failed to pair [CHAR_LIMIT=35] -->
   <!-- Toast string informing the user that BT could not be enabled [CHAR_LIMIT=35] -->
-  <string name="failed_to_enable_bt">Nun pudo activase Bluetooth</string>
   <!-- Dialog string informing the user that BT could not be enabled [CHAR_LIMIT=75] -->
-  <string name="confirm_pairing">Daveres que quies empareyar el preséu Bluetooth <xliff:g id="device_name">%1$s</xliff:g>?</string>
   <string name="pair_yes">Sí</string>
   <string name="pair_no">Non</string>
   <!-- String that is prompting the user to tap his NFC phone against a payment reader again, to
          pay with the specified app -->
-  <string name="tap_again_to_pay">Vuelvi a tocar pa pagar con <xliff:g id="app">%1$s</xliff:g></string>
+  <string name="tap_again_to_pay">Volvi tocar pa pagar con <xliff:g id="app">%1$s</xliff:g></string>
   <!-- String that is prompting the user to tap his NFC phone against a generic NFC reader again, to
          pay with the specified app -->
-  <string name="tap_again_to_complete">Toca otra vegada pa completar con <xliff:g id="app">%1$s</xliff:g></string>
+  <string name="tap_again_to_complete">Volvi tocar pa completar con <xliff:g id="app">%1$s</xliff:g></string>
   <!-- String that is telling the user that his NFC transaction couldn't be completed with the
          indicated app -->
-  <string name="transaction_failure">Nun pudo completase la tresaición con <xliff:g id="app">%1$s</xliff:g>.</string>
   <!-- String that is telling the user that his NFC transaction couldn't be completed with the
          indicated app -->
   <string name="could_not_use_app">Nun pudo usase <xliff:g id="app">%1$s</xliff:g>.</string>
@@ -55,22 +40,16 @@
   <string name="complete_with">Completar con</string>
   <!-- String that is telling the user that his default app for tap and pay has been removed,
          and asks him to pick another app as default.-->
-  <string name="default_pay_app_removed">Desanicióse\'l to serviciu preferíu pa la función Tocar &amp; Pagar. Esbillar otru?\"</string>
   <!-- Label that is shown when the user must tap another NFC enabled device to send data -->
   <string name="ask_nfc_tap">Toca otru preséu pa completar</string>
   <!-- Strings for connecting to a network from WiFi NFC tags -->
   <!-- Dialog button text for confirming the user wants to connect to the network on the tag-->
-  <string name="wifi_connect">Coneutar</string>
   <!-- Text informing the user that an error ocurred during the process of connecting to the network-->
   <string name="status_unable_to_connect">Nun pue coneutase a la rede</string>
   <!-- Text informing the user that the network was connected to successfully -->
-  <string name="status_wifi_connected">Coneutada</string>
   <!-- Title for dialog where user confirms that they want to connect to the network on the tag they tapped-->
-  <string name="title_connect_to_network">Afitar conexón con rede</string>
   <!-- Message prompt asking the user if they wish to connect to the given network. Contains the network name (ssid).-->
-  <string name="prompt_connect_to_network">Coneutar a la rede <xliff:g id="network_ssid">%1$s</xliff:g>?</string>
   <!-- Message shown in a dialog when user wants to use Android Beam, but NFC is not enabled -->
-  <string name="beam_requires_nfc_enabled">Android Beam necesita NFC p\'habilitase. Quies habilitalo?</string>
   <!-- Used to refer to in the Share Menu Android Beam . This phrase is a trademark. [CHAR LIMIT=32] -->
   <string name="android_beam">Android Beam</string>
 </resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
new file mode 100644
index 00000000..f7874880
--- /dev/null
+++ b/res/values-bs-rBA/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- A notification description string informing the user that contact details were received over NFC [CHAR-LIMIT=64] -->
+  <!-- A notification action string prompting the user to add contact details to the People application [CHAR-LIMIT=64] -->
+  <!-- A notification description string asking the user to share their contact details over NFC [CHAR-LIMIT=64] -->
+  <!-- A notification action string prompting the user to share their contact details over NFC [CHAR-LIMIT=64] -->
+  <!-- Content description of the NFC enabled notification icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- String referring to the device being connected when there is no name for the device -->
+  <!-- Toast string informing the user that the device is connecting [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is connected [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device failed to connect [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is disconnecting [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is disconnected [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is pairing [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device failed to pair [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that BT could not be enabled [CHAR_LIMIT=35] -->
+  <!-- Dialog string informing the user that BT could not be enabled [CHAR_LIMIT=75] -->
+  <!-- String that is prompting the user to tap his NFC phone against a payment reader again, to
+         pay with the specified app -->
+  <!-- String that is prompting the user to tap his NFC phone against a generic NFC reader again, to
+         pay with the specified app -->
+  <!-- String that is telling the user that his NFC transaction couldn't be completed with the
+         indicated app -->
+  <!-- String that is telling the user that his NFC transaction couldn't be completed with the
+         indicated app -->
+  <!-- Label for a dialog showing a list of applications can be paid with -->
+  <!-- Label for a dialog showing a list of applications that can be used to complete the NFC action -->
+  <!-- String that is telling the user that his default app for tap and pay has been removed,
+         and asks him to pick another app as default.-->
+  <!-- Label that is shown when the user must tap another NFC enabled device to send data -->
+  <!-- Strings for connecting to a network from WiFi NFC tags -->
+  <!-- Dialog button text for confirming the user wants to connect to the network on the tag-->
+  <!-- Text informing the user that an error ocurred during the process of connecting to the network-->
+  <!-- Text informing the user that the network was connected to successfully -->
+  <!-- Title for dialog where user confirms that they want to connect to the network on the tag they tapped-->
+  <!-- Message prompt asking the user if they wish to connect to the given network. Contains the network name (ssid).-->
+  <!-- Message shown in a dialog when user wants to use Android Beam, but NFC is not enabled -->
+  <!-- Used to refer to in the Share Menu Android Beam . This phrase is a trademark. [CHAR LIMIT=32] -->
+</resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index f7874880..9c14688d 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -6,7 +6,9 @@
   <!-- A notification description string asking the user to share their contact details over NFC [CHAR-LIMIT=64] -->
   <!-- A notification action string prompting the user to share their contact details over NFC [CHAR-LIMIT=64] -->
   <!-- Content description of the NFC enabled notification icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="cancel">Nuligi</string>
   <!-- String referring to the device being connected when there is no name for the device -->
+  <string name="device">aparato</string>
   <!-- Toast string informing the user that the device is connecting [CHAR_LIMIT=35] -->
   <!-- Toast string informing the user that the device is connected [CHAR_LIMIT=35] -->
   <!-- Toast string informing the user that the device failed to connect [CHAR_LIMIT=35] -->
@@ -16,6 +18,7 @@
   <!-- Toast string informing the user that the device failed to pair [CHAR_LIMIT=35] -->
   <!-- Toast string informing the user that BT could not be enabled [CHAR_LIMIT=35] -->
   <!-- Dialog string informing the user that BT could not be enabled [CHAR_LIMIT=75] -->
+  <string name="pair_yes">Jes</string>
   <!-- String that is prompting the user to tap his NFC phone against a payment reader again, to
          pay with the specified app -->
   <!-- String that is prompting the user to tap his NFC phone against a generic NFC reader again, to
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
new file mode 100644
index 00000000..f7874880
--- /dev/null
+++ b/res/values-es-rCO/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- A notification description string informing the user that contact details were received over NFC [CHAR-LIMIT=64] -->
+  <!-- A notification action string prompting the user to add contact details to the People application [CHAR-LIMIT=64] -->
+  <!-- A notification description string asking the user to share their contact details over NFC [CHAR-LIMIT=64] -->
+  <!-- A notification action string prompting the user to share their contact details over NFC [CHAR-LIMIT=64] -->
+  <!-- Content description of the NFC enabled notification icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- String referring to the device being connected when there is no name for the device -->
+  <!-- Toast string informing the user that the device is connecting [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is connected [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device failed to connect [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is disconnecting [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is disconnected [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is pairing [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device failed to pair [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that BT could not be enabled [CHAR_LIMIT=35] -->
+  <!-- Dialog string informing the user that BT could not be enabled [CHAR_LIMIT=75] -->
+  <!-- String that is prompting the user to tap his NFC phone against a payment reader again, to
+         pay with the specified app -->
+  <!-- String that is prompting the user to tap his NFC phone against a generic NFC reader again, to
+         pay with the specified app -->
+  <!-- String that is telling the user that his NFC transaction couldn't be completed with the
+         indicated app -->
+  <!-- String that is telling the user that his NFC transaction couldn't be completed with the
+         indicated app -->
+  <!-- Label for a dialog showing a list of applications can be paid with -->
+  <!-- Label for a dialog showing a list of applications that can be used to complete the NFC action -->
+  <!-- String that is telling the user that his default app for tap and pay has been removed,
+         and asks him to pick another app as default.-->
+  <!-- Label that is shown when the user must tap another NFC enabled device to send data -->
+  <!-- Strings for connecting to a network from WiFi NFC tags -->
+  <!-- Dialog button text for confirming the user wants to connect to the network on the tag-->
+  <!-- Text informing the user that an error ocurred during the process of connecting to the network-->
+  <!-- Text informing the user that the network was connected to successfully -->
+  <!-- Title for dialog where user confirms that they want to connect to the network on the tag they tapped-->
+  <!-- Message prompt asking the user if they wish to connect to the given network. Contains the network name (ssid).-->
+  <!-- Message shown in a dialog when user wants to use Android Beam, but NFC is not enabled -->
+  <!-- Used to refer to in the Share Menu Android Beam . This phrase is a trademark. [CHAR LIMIT=32] -->
+</resources>
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
new file mode 100644
index 00000000..f7874880
--- /dev/null
+++ b/res/values-ga-rIE/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- A notification description string informing the user that contact details were received over NFC [CHAR-LIMIT=64] -->
+  <!-- A notification action string prompting the user to add contact details to the People application [CHAR-LIMIT=64] -->
+  <!-- A notification description string asking the user to share their contact details over NFC [CHAR-LIMIT=64] -->
+  <!-- A notification action string prompting the user to share their contact details over NFC [CHAR-LIMIT=64] -->
+  <!-- Content description of the NFC enabled notification icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- String referring to the device being connected when there is no name for the device -->
+  <!-- Toast string informing the user that the device is connecting [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is connected [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device failed to connect [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is disconnecting [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is disconnected [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is pairing [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device failed to pair [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that BT could not be enabled [CHAR_LIMIT=35] -->
+  <!-- Dialog string informing the user that BT could not be enabled [CHAR_LIMIT=75] -->
+  <!-- String that is prompting the user to tap his NFC phone against a payment reader again, to
+         pay with the specified app -->
+  <!-- String that is prompting the user to tap his NFC phone against a generic NFC reader again, to
+         pay with the specified app -->
+  <!-- String that is telling the user that his NFC transaction couldn't be completed with the
+         indicated app -->
+  <!-- String that is telling the user that his NFC transaction couldn't be completed with the
+         indicated app -->
+  <!-- Label for a dialog showing a list of applications can be paid with -->
+  <!-- Label for a dialog showing a list of applications that can be used to complete the NFC action -->
+  <!-- String that is telling the user that his default app for tap and pay has been removed,
+         and asks him to pick another app as default.-->
+  <!-- Label that is shown when the user must tap another NFC enabled device to send data -->
+  <!-- Strings for connecting to a network from WiFi NFC tags -->
+  <!-- Dialog button text for confirming the user wants to connect to the network on the tag-->
+  <!-- Text informing the user that an error ocurred during the process of connecting to the network-->
+  <!-- Text informing the user that the network was connected to successfully -->
+  <!-- Title for dialog where user confirms that they want to connect to the network on the tag they tapped-->
+  <!-- Message prompt asking the user if they wish to connect to the given network. Contains the network name (ssid).-->
+  <!-- Message shown in a dialog when user wants to use Android Beam, but NFC is not enabled -->
+  <!-- Used to refer to in the Share Menu Android Beam . This phrase is a trademark. [CHAR LIMIT=32] -->
+</resources>
diff --git a/res/values-sr-rCS/strings.xml b/res/values-sr-rCS/strings.xml
new file mode 100644
index 00000000..f7874880
--- /dev/null
+++ b/res/values-sr-rCS/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- A notification description string informing the user that contact details were received over NFC [CHAR-LIMIT=64] -->
+  <!-- A notification action string prompting the user to add contact details to the People application [CHAR-LIMIT=64] -->
+  <!-- A notification description string asking the user to share their contact details over NFC [CHAR-LIMIT=64] -->
+  <!-- A notification action string prompting the user to share their contact details over NFC [CHAR-LIMIT=64] -->
+  <!-- Content description of the NFC enabled notification icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- String referring to the device being connected when there is no name for the device -->
+  <!-- Toast string informing the user that the device is connecting [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is connected [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device failed to connect [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is disconnecting [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is disconnected [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device is pairing [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that the device failed to pair [CHAR_LIMIT=35] -->
+  <!-- Toast string informing the user that BT could not be enabled [CHAR_LIMIT=35] -->
+  <!-- Dialog string informing the user that BT could not be enabled [CHAR_LIMIT=75] -->
+  <!-- String that is prompting the user to tap his NFC phone against a payment reader again, to
+         pay with the specified app -->
+  <!-- String that is prompting the user to tap his NFC phone against a generic NFC reader again, to
+         pay with the specified app -->
+  <!-- String that is telling the user that his NFC transaction couldn't be completed with the
+         indicated app -->
+  <!-- String that is telling the user that his NFC transaction couldn't be completed with the
+         indicated app -->
+  <!-- Label for a dialog showing a list of applications can be paid with -->
+  <!-- Label for a dialog showing a list of applications that can be used to complete the NFC action -->
+  <!-- String that is telling the user that his default app for tap and pay has been removed,
+         and asks him to pick another app as default.-->
+  <!-- Label that is shown when the user must tap another NFC enabled device to send data -->
+  <!-- Strings for connecting to a network from WiFi NFC tags -->
+  <!-- Dialog button text for confirming the user wants to connect to the network on the tag-->
+  <!-- Text informing the user that an error ocurred during the process of connecting to the network-->
+  <!-- Text informing the user that the network was connected to successfully -->
+  <!-- Title for dialog where user confirms that they want to connect to the network on the tag they tapped-->
+  <!-- Message prompt asking the user if they wish to connect to the given network. Contains the network name (ssid).-->
+  <!-- Message shown in a dialog when user wants to use Android Beam, but NFC is not enabled -->
+  <!-- Used to refer to in the Share Menu Android Beam . This phrase is a trademark. [CHAR LIMIT=32] -->
+</resources>
diff --git a/src/com/android/nfc/NfcBootstrapService.java b/src/com/android/nfc/NfcBootstrapService.java
deleted file mode 100644
index 1b2b7b1b..00000000
--- a/src/com/android/nfc/NfcBootstrapService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.nfc;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-/**
- * This is just a no-op service to allow Nfc app being started at boot time.
- */
-public class NfcBootstrapService extends Service {
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        stopSelf(startId);
-        return Service.START_NOT_STICKY;
-    }
-
-}
diff --git a/src/com/android/nfc/beam/BeamReceiveService.java b/src/com/android/nfc/beam/BeamReceiveService.java
index e94f8bf9..9d24dd05 100644
--- a/src/com/android/nfc/beam/BeamReceiveService.java
+++ b/src/com/android/nfc/beam/BeamReceiveService.java
@@ -92,7 +92,6 @@ public class BeamReceiveService extends Service implements BeamTransferManager.C
             unregisterReceiver(mBeamStatusReceiver);
         }
         unregisterReceiver(mBluetoothStateReceiver);
-        mTransferManager = null;
     }
 
     boolean prepareToReceive(BeamTransferRecord transferRecord) {