summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-12-28 11:56:29 -0800
committerAndroid Code Review <code-review@android.com>2010-12-28 11:56:29 -0800
commit3500d1cc714807945b1427e43eb3bde367849e43 (patch)
tree2ac520813a70797700ef294b345e5e0d82c5e296
parentcbb50b684e181f78d3ca5b304e97f9c5a67809b6 (diff)
parent453050fdaf7dcd488f399d3549ce257e7b9e7e79 (diff)
downloadandroid_packages_apps_Bluetooth-3500d1cc714807945b1427e43eb3bde367849e43.tar.gz
android_packages_apps_Bluetooth-3500d1cc714807945b1427e43eb3bde367849e43.tar.bz2
android_packages_apps_Bluetooth-3500d1cc714807945b1427e43eb3bde367849e43.zip
Merge "BT - Not possible to accept incoming obex transfers using key-presses."
-rw-r--r--src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java b/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
index fdc332c6f..ec0f8b26e 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppIncomingFileConfirmActivity.java
@@ -171,8 +171,9 @@ public class BluetoothOppIncomingFileConfirmActivity extends AlertActivity imple
Toast.makeText(this, getString(R.string.bt_toast_2), Toast.LENGTH_SHORT).show();
finish();
+ return true;
}
- return true;
+ return false;
}
@Override