summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorPradeep Panigrahi <pradeepp@codeaurora.org>2015-06-05 12:03:45 +0530
committerLinux Build Service Account <lnxbuild@localhost>2016-08-24 08:17:24 -0600
commitc6df6df4c53aae579180adf7537c641aa7b36582 (patch)
treef4f0cc9b66eb8ad0e3d8579b39680e9ff234ea5c /res/values
parentb81fc8b40cb98d82420f2dea0863855fe723f945 (diff)
downloadandroid_packages_apps_Bluetooth-c6df6df4c53aae579180adf7537c641aa7b36582.tar.gz
android_packages_apps_Bluetooth-c6df6df4c53aae579180adf7537c641aa7b36582.tar.bz2
android_packages_apps_Bluetooth-c6df6df4c53aae579180adf7537c641aa7b36582.zip
OPP: Handle file send retry scenario inside thread to avoid ANR
Use Case: 1. Turn on BT and pair with the other device via BT. 2. Launch Contacts ->press menu -> "Import/export" -> "Share visible contacts" -> "Bluetooth" -> "select paired device". 3. Turn off BT and let the transfer fail 4. Drag down the status bar and tap the bluetooth share notification 5. Wait for a while, tap "try again" Failure: ANR occurs and "Unfortunately,Bluetooth share has stopped" error comes. Root Cause: BluetoothOppSendFileInfo::generateFileInfo() takes long time to process when there is huge contact list thereby causing ANR Fix: When tap the "try again" button on the send failed dialog, the method "BluetoothOppSendFileInfo::generateFileInfo()" will be call, if there are about 1500 contacts, then this method would be very time consuming, therby causing ANR. Changed this method into the child thread execution and through a Handler send a message to the main thread after this method return, to retry failed transfer. CRs-Fixed: 522213 Change-Id: Idde7e874e4e25caba59133e0981e812b06ba2ed1
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c03034b29..2d11f097e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -245,4 +245,5 @@
<string name="bluetooth_map_settings_no_account_slots_left">Cannot select account. 0 slots left</string>
<string name="bluetooth_connected">Bluetooth audio connected</string>
<string name="bluetooth_disconnected">Bluetooth audio disconnected"</string>
+ <string name="upload_fail_waiting">Ongoing send file preparation, automatic retransmission later</string>
</resources>