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

Commit 31c509bf 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 am: 5518963f 

am: 14f6633a

Change-Id: I31a71f91b4d7816f24ff2b25ef39021296667295
parents 0c488dfa 14f6633a

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

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

    @Override

    public void onReceive(Context context, Intent intent) {

    public void onReceive(Context context, Intent intent) {

        String action = intent.getAction();

        String action = intent.getAction();



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

        if (action == null) return;

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

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

                Constants.ACTION_HANDOVER_SEND_MULTIPLE)) {

                Constants.ACTION_HANDOVER_SEND_MULTIPLE)) {

            final BluetoothDevice device =

            final BluetoothDevice device =

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

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

    @Override

    public void onReceive(Context context, Intent intent) {

    public void onReceive(Context context, Intent intent) {

        String action = intent.getAction();

        String action = intent.getAction();



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

        if (action == null) return;

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

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

            BluetoothOppManager mOppManager = BluetoothOppManager.getInstance(context);

            BluetoothOppManager mOppManager = BluetoothOppManager.getInstance(context);