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

Commit 4bc20a08 authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "Bluetooth: Prevent BT crash using adb commands" 

am: c3b006d4

Change-Id: Ibda9f44ee16b3c3f91ce8a83325e0790e193e725
parents acfeb7ce c3b006d4

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

+5 −0
Original line number Diff line number Diff line
@@ -75,6 +75,11 @@ public class BluetoothOppLauncherActivity extends Activity { 


        Intent intent = getIntent();

        String action = intent.getAction();

        if (action == null) {

            Log.w(TAG, " Received " + intent + " with null action");

            finish();

            return;

        }



        if (action.equals(Intent.ACTION_SEND) || action.equals(Intent.ACTION_SEND_MULTIPLE)) {

            //Check if Bluetooth is available in the beginning instead of at the end

android/app/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class BluetoothPbapActivity extends AlertActivity 
        Intent i = getIntent();

        String action = i.getAction();

        mDevice = i.getParcelableExtra(BluetoothPbapService.EXTRA_DEVICE);

        if (action.equals(BluetoothPbapService.AUTH_CHALL_ACTION)) {

        if (action != null && action.equals(BluetoothPbapService.AUTH_CHALL_ACTION)) {

            showPbapDialog(DIALOG_YES_NO_AUTH);

            mCurrentDialog = DIALOG_YES_NO_AUTH;

        } else {