Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5518963f authored by Sravan voleti's avatar Sravan voleti Committed by android-build-merger
Browse files

Merge "Bluetooth: Prevent BT crash using adb commands" 

am: 97b1be3e

Change-Id: I870a8fc8028456078e00b50b353b5c121ae9854e
parents 9caeb6a1 97b1be3e

android/app/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ public class BluetoothOppHandoverReceiver extends BroadcastReceiver { 
    @Override

    public void onReceive(Context context, Intent intent) {

        String action = intent.getAction();



        if (D) Log.d(TAG, "Action :" + action);

        if (action == null) return;

        if (action.equals(Constants.ACTION_HANDOVER_SEND) || action.equals(

                Constants.ACTION_HANDOVER_SEND_MULTIPLE)) {

            final BluetoothDevice device =

android/app/src/com/android/bluetooth/opp/BluetoothOppReceiver.java

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ public class BluetoothOppReceiver extends BroadcastReceiver { 
    @Override

    public void onReceive(Context context, Intent intent) {

        String action = intent.getAction();



        if (D) Log.d(TAG, " action :" + action);

        if (action == null) return;

        if (action.equals(BluetoothDevicePicker.ACTION_DEVICE_SELECTED)) {

            BluetoothOppManager mOppManager = BluetoothOppManager.getInstance(context);