summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-11-20 18:13:15 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-11-20 18:13:15 -0800
commit488c70513cc92ffef415074e5fed67c80ead86d7 (patch)
tree19a6feef89cc17bee53bdd79ceaf8a5f6b912c78 /src/com
parent291d2ab0973cd123e0f659e14b227a07998750e6 (diff)
parent513ebac9d923bed10444bf894ee9f80a7e38bb4a (diff)
downloadandroid_packages_apps_Bluetooth-488c70513cc92ffef415074e5fed67c80ead86d7.tar.gz
android_packages_apps_Bluetooth-488c70513cc92ffef415074e5fed67c80ead86d7.tar.bz2
android_packages_apps_Bluetooth-488c70513cc92ffef415074e5fed67c80ead86d7.zip
Merge "Bluetooth: Check Broadcast Action before starting service."
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/bluetooth/opp/BluetoothOppReceiver.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppReceiver.java b/src/com/android/bluetooth/opp/BluetoothOppReceiver.java
index a6770aba7..1479646eb 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppReceiver.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppReceiver.java
@@ -63,10 +63,12 @@ public class BluetoothOppReceiver extends BroadcastReceiver {
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
- if (!Utils.checkCaller()) {
+ /* Ignore if Broadcast action is not transfer complete and Invalid user */
+ if (!Utils.checkCaller() && !action.equals(BluetoothShare.TRANSFER_COMPLETED_ACTION)) {
Log.w(TAG, action + " received for non-active user, ignoring!!");
return;
}
+ if (V) Log.v(TAG, action + " Intent received for active user");
if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
if (BluetoothAdapter.STATE_ON == intent.getIntExtra(