Merge branch 'cm-11.0' into stable/cm-11.0

14 files changed, 197 insertions, 9 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d33f2dae7..584a04eee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,7 +17,7 @@
         android:description="@string/permdesc_bluetoothWhitelist"
         android:protectionLevel="signature" />
 
-    <!--  Allows receiving handover status broadcasts from Bluetooth -->,
+    <!--  Allows receiving handover status broadcasts from Bluetooth -->
     <permission android:name="com.android.permission.HANDOVER_STATUS"
         android:label="@string/permlab_handoverStatus"
         android:description="@string/permdesc_handoverStatus"
diff --git a/res/values-af/cm_caf.xml b/res/values-af/cm_caf.xml
new file mode 100644
index 000000000..e51a69078
--- /dev/null
+++ b/res/values-af/cm_caf.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="empty_file_notification_sent">Bluetooth-deel: Ontvanger verwerp leë lêer <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/res/values-eu/cm_caf.xml b/res/values-eu/cm_caf.xml
new file mode 100644
index 000000000..78138bb23
--- /dev/null
+++ b/res/values-eu/cm_caf.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="empty_file_notification_sent">Bluetooth: <xliff:g id="file">%1$s</xliff:g> fitxategi hutsa ukatua izan da</string>
+  <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/res/values-hr/cm_caf.xml b/res/values-hr/cm_caf.xml
new file mode 100644
index 000000000..c914bfe0b
--- /dev/null
+++ b/res/values-hr/cm_caf.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="empty_file_notification_sent">Bluetooth djeljenje: Odbijena prazna datoteka <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/res/values-ja/cm_caf.xml b/res/values-ja/cm_caf.xml
new file mode 100644
index 000000000..59296cf21
--- /dev/null
+++ b/res/values-ja/cm_caf.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="empty_file_notification_sent">Bluetooth共有: リモートは長さ0のファイル<xliff:g id="file">%1$s</xliff:g>を拒否しました</string>
+  <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/res/values-ko/cm_caf.xml b/res/values-ko/cm_caf.xml
new file mode 100644
index 000000000..acbe6eeb1
--- /dev/null
+++ b/res/values-ko/cm_caf.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="empty_file_notification_sent">블루투스 공유: 상대가 길이가 0인 파일 <xliff:g id="file">%1$s</xliff:g>을(를) 거부하였습니다. </string>
+  <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 7ffbd7ad0..ace7c1ad5 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -35,7 +35,7 @@
   <string name="airplane_error_title">باری فڕۆکه‌</string>
   <string name="airplane_error_msg">ناتوانی بلوتوس بەکاربهێنی لە باری فڕۆکە.</string>
   <string name="bt_enable_line1">بۆ بەکارهێنانی خزمەتگوزاری بلوتوس ئەبێت بلوتوسەکە بکەیتەوە.</string>
-  <string name="bt_enable_line2">ئێستا کردنەوەی بلوتوس?</string>
+  <string name="bt_enable_line2">ئێستا چالاکردنی بلوتوس?</string>
   <string name="bt_enable_cancel">هەڵوەشاندنەوە</string>
   <string name="bt_enable_ok">کردنە کار</string>
   <string name="incoming_file_confirm_title">گواستنه‌وه‌ی په‌ڕگه‌</string>
@@ -53,7 +53,7 @@
   <string name="notification_received_fail">بەشداریکردنی بلوتوس: File <xliff:g id="file">%1$s</xliff:g> نەگەیشت</string>
   <string name="notification_sending">بەشداریکردنی بلوتوس: وەرگرتن<xliff:g id="file">%1$s</xliff:g></string>
   <string name="notification_sent">بەشداریکردنی بلوتوس: گەیشت<xliff:g id="file">%1$s</xliff:g></string>
-  <string name="notification_sent_complete">١٠٠% تەواوبوو</string>
+  <string name="notification_sent_complete">100% تەواوبوو</string>
   <string name="notification_sent_fail">بەشداری بلوتوس: فایل<xliff:g id="file">%1$s</xliff:g> نەگەیشت</string>
   <string name="download_title">گواستنه‌وه‌ی فایل</string>
   <string name="download_line1">لە: \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
@@ -83,7 +83,7 @@
   <string name="not_exist_file">فایل نیە</string>
   <string name="not_exist_file_desc">فایلەکە بونی نیە. \n</string>
   <string name="enabling_progress_title">تکایە چاوەڕێبکە\u2026</string>
-  <string name="enabling_progress_content">کردنەوەی بلوتوس\u2026</string>
+  <string name="enabling_progress_content">چالاکردنی بلوتوس\u2026</string>
   <string name="bt_toast_1">فەیلەکە ئەگەیەت. پشکنینی تێبینی.</string>
   <string name="bt_toast_2">فایلەکە ناتوانرێت بنێردرێت.</string>
   <string name="bt_toast_3">گەیشتنی فایلەکە وەستا لە \u0022<xliff:g id="sender">%1$s</xliff:g>\u0022</string>
@@ -119,6 +119,6 @@
   <string name="transfer_menu_clear_all">پاکردنەوەی خشتەکە</string>
   <string name="transfer_menu_open">کردنه‌وه‌</string>
   <string name="transfer_menu_clear">پاکردنەوە لە خشتەکە</string>
-  <string name="transfer_clear_dlg_title">پاکردنەوە</string>
+  <string name="transfer_clear_dlg_title">پاچالاکردن</string>
   <string name="bluetooth_share_file_name" translate="false">بەشداری_ناوەڕۆکی_بلوتوس</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index a84ba7afd..e67545e38 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -17,6 +17,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="bt_share_picker_label">Bluetooth</string>
+  <string name="unknown_device">Onbekannten Apparat</string>
   <string name="bt_enable_cancel">Ofbriechen</string>
   <string name="incoming_file_confirm_timeout_ok">OK</string>
   <string name="download_fail_ok">OK</string>
diff --git a/res/values-lb/strings_pbap.xml b/res/values-lb/strings_pbap.xml
index d2c0ee15e..2df070ef9 100644
--- a/res/values-lb/strings_pbap.xml
+++ b/res/values-lb/strings_pbap.xml
@@ -3,6 +3,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="pbap_session_key_dialog_title">Tipp de Sëtzungsschlëssel fir %1$s an</string>
   <string name="pbap_session_key_dialog_header">Bluetooth-Sëtzungsschlëssel néideg</string>
+  <string name="pbap_acceptance_timeout_message">Beim Acceptéiere vun der Connectioun mat %1$s ass d\'Zäit ofgelaf</string>
+  <string name="auth_notif_ticker">Obex-Authentifizéierungs-Ufro</string>
   <string name="auth_notif_title">Sëtzungsschlëssel</string>
   <string name="auth_notif_message">Tipp de Sëtzungsschlëssel fir %1$s an</string>
   <string name="unknownName">Onbekannten Numm</string>
diff --git a/res/values-nb/cm_caf.xml b/res/values-nb/cm_caf.xml
new file mode 100644
index 000000000..bc3475d18
--- /dev/null
+++ b/res/values-nb/cm_caf.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="empty_file_notification_sent">Bluetooth-deling: Fjern avvist null lengdefil <xliff:g id="file"> %1$s </xliff:g></string>
+  <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/res/values-pl/cm_caf.xml b/res/values-pl/cm_caf.xml
new file mode 100644
index 000000000..5544a37ac
--- /dev/null
+++ b/res/values-pl/cm_caf.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="empty_file_notification_sent">Udostępnianie Bluetooth: Odrzucono plik o zerowej długości <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/res/values-sv/cm_caf.xml b/res/values-sv/cm_caf.xml
new file mode 100644
index 000000000..c3b85fc1f
--- /dev/null
+++ b/res/values-sv/cm_caf.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="empty_file_notification_sent">Bluetoothdelning: Fjärrpart nekade nollängdsfilen <xliff:g id="file">%1$s</xliff:g></string>
+  <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/res/values-uk/cm_caf.xml b/res/values-uk/cm_caf.xml
new file mode 100644
index 000000000..7dc307971
--- /dev/null
+++ b/res/values-uk/cm_caf.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<!--
+     Copyright (C) 2014 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="empty_file_notification_sent">Надсилання по Bluetooth: пристрій не приймає файл <xliff:g id="file">%1$s</xliff:g> нульової довжини</string>
+  <string name="format_progress_text">%1$d%%</string>
+</resources>
diff --git a/src/com/android/bluetooth/map/BluetoothMnsObexClient.java b/src/com/android/bluetooth/map/BluetoothMnsObexClient.java
index 1014347e3..ff7440fc9 100644
--- a/src/com/android/bluetooth/map/BluetoothMnsObexClient.java
+++ b/src/com/android/bluetooth/map/BluetoothMnsObexClient.java
@@ -392,10 +392,6 @@ public class BluetoothMnsObexClient {
 
                 if (bytesWritten == eventBytes.length) {
                     Log.i(TAG, "SendEvent finished send length" + eventBytes.length);
-                    if (putOperation != null) {
-                        if (V) Log.v(TAG, "Closing putOperation");
-                        putOperation.close();
-                    }
                     if (outputStream != null) {
                         if (V) Log.v(TAG, "Closing outputStream");
                         outputStream.close();